autoproj 2.0.0.rc20 → 2.0.0.rc21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/autoproj/ops/build.rb +0 -1
- data/lib/autoproj/package_selection.rb +11 -7
- data/lib/autoproj/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d5ebd976ff9f8069409ddad62b9031dcfade571f
|
4
|
+
data.tar.gz: fd963a41fcdadfdf6221d1cd3467da52369103eb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 339c79e8059fd15a5945dd32014fcfca57a935da395adddaed9badbe307fc85d38f49d424b14360a89b4da6d0486a6a9378969a64f0881dace31ce19572bf677
|
7
|
+
data.tar.gz: 3bef43394b2f4402d4d0f7d2abd7d8cde7801da7024d20e8591461abdbd7cab8e613114158432efc630d14ba58da1255af8fbaf1ff187f9d4ce927aefac76ad6
|
data/lib/autoproj/ops/build.rb
CHANGED
@@ -98,6 +98,8 @@ def initialize_copy(old)
|
|
98
98
|
old.matches.each do |sel, set|
|
99
99
|
@matches[sel] = set.dup
|
100
100
|
end
|
101
|
+
@source_packages = old.source_packages.dup
|
102
|
+
@osdeps = old.osdeps.dup
|
101
103
|
end
|
102
104
|
|
103
105
|
def has_match_for?(sel)
|
@@ -138,18 +140,20 @@ def filter_excluded_and_ignored_packages(manifest)
|
|
138
140
|
end
|
139
141
|
|
140
142
|
excluded = excluded.to_set
|
141
|
-
ignored
|
143
|
+
ignored = ignored.to_set
|
142
144
|
expansion.delete_if do |pkg_name|
|
143
145
|
ignored.include?(pkg_name) || excluded.include?(pkg_name)
|
144
146
|
end
|
145
147
|
end
|
146
148
|
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
149
|
+
source_packages.delete_if do |pkg_name|
|
150
|
+
manifest.excluded?(pkg_name) || manifest.ignored?(pkg_name)
|
151
|
+
end
|
152
|
+
osdeps.delete_if do |pkg_name|
|
153
|
+
manifest.excluded?(pkg_name) || manifest.ignored?(pkg_name)
|
154
|
+
end
|
155
|
+
selection.delete_if do |pkg_name, _|
|
156
|
+
manifest.excluded?(pkg_name) || manifest.ignored?(pkg_name)
|
153
157
|
end
|
154
158
|
matches.delete_if do |key, sel|
|
155
159
|
sel.empty?
|
data/lib/autoproj/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autoproj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.0.
|
4
|
+
version: 2.0.0.rc21
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sylvain Joyeux
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-03-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: autobuild
|