autoproj 1.13.3 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb773b4a9bc2b1de9d98a219109dceb361598a20
-  data.tar.gz: d1fa8ff80b304bab208efdd8e3f597b8df5b4f76
+  metadata.gz: cf8eb8b24aec621159d6e9502228758b76978903
+  data.tar.gz: 23b79851f11f3127c416d8af6f1fa30bc30da134
 SHA512:
-  metadata.gz: f91eb7f06627509cb5e6198c3f09a8e7b81f64c7c5349de7e12da1d87d125d2c058abac75be62f3c42450d73c3528b48be8354aa630b75912507527c3453ff8e
-  data.tar.gz: e7b5d426ecf02a4f77f92ce2a651f739fd3252b9bf29a1ffc6a2ec55a713ace4fc60029dc0f70b1953ed6b63990ec0f9739d6b97cbd75cef417f65703bb05a82
+  metadata.gz: 5353eb913981abe06b00a035423e80bd44d57193429d264a068fb2c215bcbc4802485e41809c275383af2811a41e4efa86d1c2301b5919892371f36d59be9cd8
+  data.tar.gz: 2ace1ed4f065d92d6b5e8acc07c37b9e0b2c20c40a9b879d02dde824e72c2ffa923389985c732733ec8f93633cf1038a2423efefa27a610e55e8da0587c6ad15

data/bin/autoproj

@@ -196,7 +196,7 @@ Autoproj::CmdLine.report do
     # build the list of packages that have actually been selected on the command
     # line.
     all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-    Autoproj::CmdLine.load_all_available_package_manifests
+    Autoproj::CmdLine.load_all_available_package_manifests(false)
     Autoproj::CmdLine.export_installation_manifest
 
     if Autoproj::CmdLine.update_os_dependencies? && !all_enabled_packages.empty?

data/lib/autoproj/cmdline.rb

@@ -355,10 +355,11 @@ module Autoproj
         # but simply warns in case of errors. The reasons for that is that the
         # only packages that should really block the current processing are the
         # ones that are selected on the command line
-        def self.load_all_available_package_manifests
+        def self.load_all_available_package_manifests(overwrite_existing = true)
             # Load the manifest for packages that are already present on the
             # file system
             manifest.packages.each_value do |pkg|
+                next if !overwrite_existing && pkg.autobuild.description
                 if File.directory?(pkg.autobuild.srcdir)
                     begin
                         manifest.load_package_manifest(pkg.autobuild.name)
@@ -1542,7 +1543,7 @@ where 'mode' is one of:
             Autoproj::CmdLine.finalize_package_setup
 
 
-            load_all_available_package_manifests
+            load_all_available_package_manifests(true)
             update_environment
             remaining_arguments
         end

data/lib/autoproj/ops/configuration.rb

@@ -210,7 +210,6 @@ module Autoproj
             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?
@@ -276,6 +275,7 @@ module Autoproj
                 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/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.13.3"
+    VERSION = "1.13.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.4
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild