autoproj 1.6.2.rc8 → 1.6.2.rc9

data/History.txt

@@ -10,7 +10,7 @@
    errors are properly presented at the end of the run.
  * when boostrapping, check that the current directory is empty and warn the
    user if it is not.
- * a few minor bugfixes
+ * a few more minor bugfixes
 
 = Version 1.6.1
  * fix a limitation of giving directories on the command line. Before, only

data/lib/autoproj/manifest.rb

@@ -1246,7 +1246,7 @@ module Autoproj
 
             # First, remove packages that are directly referenced by name or by
             # package set names
-            selected_packages.delete_if do |sel|
+            selected_packages.each do |sel|
                 sel = Regexp.new(Regexp.quote(sel))
 
                 packages = all_layout_packages.
@@ -1263,13 +1263,9 @@ module Autoproj
                 !packages.empty? || !sources.empty?
             end
 
-            if selected_packages.empty?
-                return expanded_packages
-            end
-
             # Now, search for layout names
             each_package_set(nil) do |layout_name, packages, _|
-                selected_packages.delete_if do |sel|
+                selected_packages.each do |sel|
                     if layout_name[0..-1] =~ Regexp.new("#{sel}\/?$")
                         expanded_packages |= packages.to_set
                     end
@@ -1278,7 +1274,7 @@ module Autoproj
 
             # Finally, check for package source directories
             all_packages = self.all_package_names
-            selected_packages.delete_if do |sel|
+            selected_packages.each do |sel|
                 match_dir      = Regexp.new("^#{Regexp.quote(sel)}")
                 match_pkg_name = Regexp.new(Regexp.quote(sel))
                 all_packages.each do |pkg_name|
@@ -1286,7 +1282,8 @@ module Autoproj
                     if pkg_name =~ match_pkg_name || pkg.srcdir =~ match_dir
                         # Check-out packages that are not in the manifest only
                         # if they are explicitely selected
-                        if !File.directory?(pkg.srcdir) && !all_layout_packages.include?(pkg.name)
+                        puts "#{pkg_name} #{pkg.srcdir} #{sel} #{pkg_name != sel} #{pkg.srcdir != sel}"
+                        if pkg_name != sel && pkg.srcdir != sel && !all_layout_packages.include?(pkg.name)
                             next
                         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.2.rc8"
+    VERSION = "1.6.2.rc9"
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 6
   - 2
-  - rc8
-  version: 1.6.2.rc8
+  - rc9
+  version: 1.6.2.rc9
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +01:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency