autoproj 2.0.0.rc20 → 2.0.0.rc21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fbd65182b37417db130e9ef63810501eccbfc5c
-  data.tar.gz: 47857dc0216176e61cbd61efb0f46782f10aac46
+  metadata.gz: d5ebd976ff9f8069409ddad62b9031dcfade571f
+  data.tar.gz: fd963a41fcdadfdf6221d1cd3467da52369103eb
 SHA512:
-  metadata.gz: fa4af40e629100c3eda2db1804980fc90348e2d4920a1f194fed013da91301c413c3a0db55eaf8a09b8e2040371db0d7c529634260d0af0506fd3a87bbf1bf3c
-  data.tar.gz: 22fa50e159b06b43635eca65c9df4d4c9c0ed4a1afff089e9a33d974ba200ffe0b1b656f1df2afe3bf43064b3965c3e90a279bbe04218ae23f2b8256af31b8cd
+  metadata.gz: 339c79e8059fd15a5945dd32014fcfca57a935da395adddaed9badbe307fc85d38f49d424b14360a89b4da6d0486a6a9378969a64f0881dace31ce19572bf677
+  data.tar.gz: 3bef43394b2f4402d4d0f7d2abd7d8cde7801da7024d20e8591461abdbd7cab8e613114158432efc630d14ba58da1255af8fbaf1ff187f9d4ce927aefac76ad6

data/lib/autoproj/ops/build.rb

@@ -22,7 +22,6 @@ def initialize(manifest)
             # {update_os_packages?} is set to true (the default)
             def rebuild_all
                 packages = manifest.all_layout_packages
-                manifest.pristine_os_packages(packages)
                 rebuild_packages(packages, packages)
             end
 

data/lib/autoproj/package_selection.rb

@@ -98,6 +98,8 @@ def initialize_copy(old)
                 old.matches.each do |sel, set|
                     @matches[sel] = set.dup
                 end
+                @source_packages = old.source_packages.dup
+                @osdeps = old.osdeps.dup
             end
 
             def has_match_for?(sel)
@@ -138,18 +140,20 @@ def filter_excluded_and_ignored_packages(manifest)
                     end
 
                     excluded = excluded.to_set
-                    ignored = ignored.to_set
+                    ignored  = ignored.to_set
                     expansion.delete_if do |pkg_name|
                         ignored.include?(pkg_name) || excluded.include?(pkg_name)
                     end
                 end
 
-                selection.keys.sort.each do |pkg_name|
-                    if manifest.excluded?(pkg_name)
-                        selection.delete(pkg_name)
-                    elsif manifest.ignored?(pkg_name)
-                        selection.delete(pkg_name)
-                    end
+                source_packages.delete_if do |pkg_name| 
+                    manifest.excluded?(pkg_name) || manifest.ignored?(pkg_name)
+                end
+                osdeps.delete_if do |pkg_name| 
+                    manifest.excluded?(pkg_name) || manifest.ignored?(pkg_name)
+                end
+                selection.delete_if do |pkg_name, _|
+                    manifest.excluded?(pkg_name) || manifest.ignored?(pkg_name)
                 end
                 matches.delete_if do |key, sel|
                     sel.empty?

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc20"
+    VERSION = "2.0.0.rc21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc20
+  version: 2.0.0.rc21
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild