autoproj 2.0.0.rc21 → 2.0.0.rc22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5ebd976ff9f8069409ddad62b9031dcfade571f
-  data.tar.gz: fd963a41fcdadfdf6221d1cd3467da52369103eb
+  metadata.gz: 96eeb69d5f337a90861b5c2ea4124d724964de01
+  data.tar.gz: a43d11ef0c140d1a371d415ff44396376a85a893
 SHA512:
-  metadata.gz: 339c79e8059fd15a5945dd32014fcfca57a935da395adddaed9badbe307fc85d38f49d424b14360a89b4da6d0486a6a9378969a64f0881dace31ce19572bf677
-  data.tar.gz: 3bef43394b2f4402d4d0f7d2abd7d8cde7801da7024d20e8591461abdbd7cab8e613114158432efc630d14ba58da1255af8fbaf1ff187f9d4ce927aefac76ad6
+  metadata.gz: d6af141de1e18c6d5c0ffc376fc039f9a573a49d786ecea86d0252284efc9634a65fa010786bb720c7c2c8148f3ef951e1d60714d409fd3018fb59f67960ecf4
+  data.tar.gz: a0fe4e53b40af639124cbce3f3987c17d69dbac1c2967034806367fef9a16c6b116556b19397d33ad38075d74afef49cd72b7a03dbcaba5d77f3a467b50648ea

data/lib/autoproj/ops/configuration.rb

@@ -226,7 +226,6 @@ def load_and_update_package_sets(root_pkg_set, options = Hash.new)
             by_name = Hash.new
 
             required_remotes_dirs = Array.new
-            required_user_dirs = Array.new
 
             queue = queue_auto_imports_if_needed(Array.new, root_pkg_set, root_pkg_set)
             while !queue.empty?
@@ -294,6 +293,7 @@ def load_and_update_package_sets(root_pkg_set, options = Hash.new)
                 queue_auto_imports_if_needed(queue, pkg_set, root_pkg_set)
             end
 
+            required_user_dirs = by_name.collect { |k,v| k }
             cleanup_remotes_dir(package_sets, required_remotes_dirs)
             cleanup_remotes_user_dir(package_sets, required_user_dirs)
             package_sets

data/lib/autoproj/ops/import.rb

@@ -181,7 +181,7 @@ def import_selected_packages(selection, updated_packages, options = Hash.new)
                         # interactive imports if there are some. Otherwise,
                         # we're done
                         if interactive_imports.empty?
-                            return all_processed_packages
+                            break
                         else
                             interactive_imports.each do |pkg|
                                 begin
@@ -226,6 +226,9 @@ def import_selected_packages(selection, updated_packages, options = Hash.new)
                     raise ImportFailed, "import of #{failures.size} packages failed: #{failures.keys.map(&:name).sort.join(", ")}"
                 end
 
+                all_processed_packages.delete_if do |pkg|
+                    ws.manifest.excluded?(pkg.name) || ws.manifest.ignored?(pkg.name)
+                end
                 all_processed_packages
 
             ensure
@@ -271,9 +274,12 @@ def finalize_package_load(processed_packages)
                             pkg.os_packages << pkg_name
                         end
                     end
-                    pkg.prepare
-                    Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
-                    pkg.update_environment
+
+                    if File.directory?(pkg.srcdir)
+                        pkg.prepare
+                        Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
+                        pkg.update_environment
+                    end
                     package_queue.concat(pkg.dependencies)
                 end
                 all

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc21"
+    VERSION = "2.0.0.rc22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc21
+  version: 2.0.0.rc22
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild