lib/autoproj/autobuild.rb in autoproj-1.7.19.rc1 vs lib/autoproj/autobuild.rb in autoproj-1.7.19.rc2

@@ -140,12 +140,12 @@
                     disabled << name
                     next
                 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)
                     osdeps.concat(pkg_osdeps)
                 else
@@ -156,10 +156,10 @@
         end
 
         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
         end