autoproj 1.8.2.b18 → 1.8.2.b19

data/lib/autoproj/cmdline.rb

@@ -550,9 +550,6 @@ module Autoproj
         def self.import_packages(selection)
             selected_packages = selection.packages.
                 map do |pkg_name|
-                    if Autoproj.manifest.excluded?(pkg_name)
-                        raise
-                    end
                     pkg = Autobuild::Package[pkg_name]
                     if !pkg
                         raise ConfigError.new, "selected package #{pkg_name} does not exist"
@@ -561,7 +558,7 @@ module Autoproj
                 end.to_set
 
             # The set of all packages that are currently selected by +selection+
-            all_enabled_packages = Set.new
+            all_processed_packages = Set.new
             # The reverse dependencies for the package tree. It is discovered as
             # we go on with the import
             #
@@ -574,8 +571,8 @@ module Autoproj
             while !package_queue.empty?
                 pkg = package_queue.shift
                 # Remove packages that have already been processed
-                next if all_enabled_packages.include?(pkg.name)
-                all_enabled_packages << pkg.name
+                next if all_processed_packages.include?(pkg.name)
+                all_processed_packages << pkg.name
 
                 # If the package has no importer, the source directory must
                 # be there
@@ -598,7 +595,6 @@ module Autoproj
                     mark_exclusion_along_revdeps(pkg.name, reverse_dependencies)
                     # Run a filter now, to have errors as early as possible
                     selection.filter_excluded_and_ignored_packages(Autoproj.manifest)
-                    all_enabled_packages.delete(pkg.name)
                     # Delete this package from the current_packages set
                     true
                 end
@@ -636,10 +632,17 @@ module Autoproj
                 selection.filter_excluded_and_ignored_packages(Autoproj.manifest)
             end
 
-            # We finally resolve optional dependencies at the very end, as the
-            # list of exclusions may have changed
-            all_enabled_packages.each do |pkg_name|
-                Autobuild::Package[pkg_name].resolve_optional_dependencies
+	    all_enabled_packages = Set.new
+	    package_queue = selection.packages.dup
+	    # Run optional dependency resolution until we have a fixed point
+	    while !package_queue.empty?
+		pkg_name = package_queue.shift
+		next if all_enabled_packages.include?(pkg_name)
+		all_enabled_packages << pkg_name
+
+		pkg = Autobuild::Package[pkg_name]
+		pkg.resolve_optional_dependencies
+		package_queue.concat(pkg.dependencies)
             end
 
             if Autoproj.verbose

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b18"
+    VERSION = "1.8.2.b19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.b18
+  version: 1.8.2.b19
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &12848100 !ruby/object:Gem::Requirement
+  requirement: &9626160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *12848100
+  version_requirements: *9626160
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &12847280 !ruby/object:Gem::Requirement
+  requirement: &9625580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *12847280
+  version_requirements: *9625580
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &12846560 !ruby/object:Gem::Requirement
+  requirement: &9625020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *12846560
+  version_requirements: *9625020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12845640 !ruby/object:Gem::Requirement
+  requirement: &9624220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *12845640
+  version_requirements: *9624220
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &12868200 !ruby/object:Gem::Requirement
+  requirement: &9622800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *12868200
+  version_requirements: *9622800
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.