autoproj 1.7.19.rc1 → 1.7.19.rc2

data/lib/autoproj/autobuild.rb

@@ -142,8 +142,8 @@ module Autobuild
                 end
 
                 pkg_autobuild, pkg_osdeps = partition_package(name)
-                valid = pkg_autobuild.any? { |pkg| !Autoproj.manifest.package_enabled?(pkg) } ||
-                    pkg_osdeps.any? { |pkg| !Autoproj.manifest.package_enabled?(pkg) }
+                valid = pkg_autobuild.all? { |pkg| Autoproj.manifest.package_enabled?(pkg) } &&
+                    pkg_osdeps.all? { |pkg| Autoproj.manifest.package_enabled?(pkg) }
 
                 if valid
                     packages.concat(pkg_autobuild)
@@ -158,7 +158,7 @@ module Autobuild
         def resolve_optional_dependencies
             if !Autoproj::CmdLine.ignore_dependencies?
                 packages, osdeps, disabled = partition_optional_dependencies
-                packages.each { |pkg| depends_on(packages) }
+                packages.each { |pkg| depends_on(pkg) }
                 @os_packages ||= Set.new
                 @os_packages |= osdeps.to_set
             end

data/lib/autoproj/cmdline.rb

@@ -474,6 +474,10 @@ module Autoproj
                 if !opt_deps.empty?
                     Autoproj.progress "   disabled opt deps: #{opt_deps.join(", ")}"
                 end
+
+                if !pkg.os_packages.empty?
+                    Autoproj.progress "   OSdeps: #{pkg.os_packages.to_a.sort.join(", ")}"
+                end
             end
 
             if !packages_not_present.empty?

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.19.rc1"
+    VERSION = "1.7.19.rc2"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 15424223
+  hash: 15424217
   prerelease: 7
   segments: 
   - 1
   - 7
   - 19
   - rc
-  - 1
-  version: 1.7.19.rc1
+  - 2
+  version: 1.7.19.rc2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-21 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild