autoproj 1.8.2.b23 → 1.8.2.b24

data/bin/autoproj

@@ -136,10 +136,12 @@ EOTEXT
     #
     # First do the resolution to get auto-add, finalize the package
     # configuration, and then re-resolve
-    Autoproj::CmdLine.resolve_user_selection(selected_packages)
-    # Now load the rest of the configuration, and filter out exclusions
-    Autoproj::CmdLine.finalize_package_setup
     resolved_selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
+    # Now load the rest of the configuration
+    Autoproj::CmdLine.finalize_package_setup
+    # Finally, filter out exclusions
+    resolved_selected_packages.filter_excluded_and_ignored_packages(Autoproj.manifest)
+
     if !selected_packages.empty?
         command_line_selection = resolved_selected_packages.dup
     else

data/lib/autoproj/autobuild.rb

@@ -339,7 +339,7 @@ def package_common(package_type, spec, &block) # :nodoc:
         old_file     = Autoproj.manifest.definition_file(package_name)
         Autoproj.warn "#{package_name} from #{current_file} is overridden by the definition in #{old_file}"
 
-        return
+        return Autobuild::Package[package_name]
     end
 
     # Check if this package is ignored

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b23"
+    VERSION = "1.8.2.b24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.b23
+  version: 1.8.2.b24
   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: &4846620 !ruby/object:Gem::Requirement
+  requirement: &20268800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *4846620
+  version_requirements: *20268800
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &4846060 !ruby/object:Gem::Requirement
+  requirement: &20268240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *4846060
+  version_requirements: *20268240
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &4845480 !ruby/object:Gem::Requirement
+  requirement: &20267620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *4845480
+  version_requirements: *20267620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &4844600 !ruby/object:Gem::Requirement
+  requirement: &20266800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *4844600
+  version_requirements: *20266800
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &4843260 !ruby/object:Gem::Requirement
+  requirement: &20265500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *4843260
+  version_requirements: *20265500
 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.