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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1fbd65182b37417db130e9ef63810501eccbfc5c
4
- data.tar.gz: 47857dc0216176e61cbd61efb0f46782f10aac46
3
+ metadata.gz: d5ebd976ff9f8069409ddad62b9031dcfade571f
4
+ data.tar.gz: fd963a41fcdadfdf6221d1cd3467da52369103eb
5
5
  SHA512:
6
- metadata.gz: fa4af40e629100c3eda2db1804980fc90348e2d4920a1f194fed013da91301c413c3a0db55eaf8a09b8e2040371db0d7c529634260d0af0506fd3a87bbf1bf3c
7
- data.tar.gz: 22fa50e159b06b43635eca65c9df4d4c9c0ed4a1afff089e9a33d974ba200ffe0b1b656f1df2afe3bf43064b3965c3e90a279bbe04218ae23f2b8256af31b8cd
6
+ metadata.gz: 339c79e8059fd15a5945dd32014fcfca57a935da395adddaed9badbe307fc85d38f49d424b14360a89b4da6d0486a6a9378969a64f0881dace31ce19572bf677
7
+ data.tar.gz: 3bef43394b2f4402d4d0f7d2abd7d8cde7801da7024d20e8591461abdbd7cab8e613114158432efc630d14ba58da1255af8fbaf1ff187f9d4ce927aefac76ad6
@@ -22,7 +22,6 @@ def initialize(manifest)
22
22
  # {update_os_packages?} is set to true (the default)
23
23
  def rebuild_all
24
24
  packages = manifest.all_layout_packages
25
- manifest.pristine_os_packages(packages)
26
25
  rebuild_packages(packages, packages)
27
26
  end
28
27
 
@@ -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 = ignored.to_set
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
- selection.keys.sort.each do |pkg_name|
148
- if manifest.excluded?(pkg_name)
149
- selection.delete(pkg_name)
150
- elsif manifest.ignored?(pkg_name)
151
- selection.delete(pkg_name)
152
- end
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?
@@ -1,3 +1,3 @@
1
1
  module Autoproj
2
- VERSION = "2.0.0.rc20"
2
+ VERSION = "2.0.0.rc21"
3
3
  end
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.rc20
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-02-29 00:00:00.000000000 Z
11
+ date: 2016-03-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: autobuild