autoproj 2.0.0.rc33 → 2.0.0.rc34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1bbd3c8a0a54c4344fc5865309106b3869d16bf
-  data.tar.gz: 84ba1ca1161c05483ab51c3239a59c48e8cfcea4
+  metadata.gz: 4c2f6ef91c660d96b417ee9d3131407b4346e7ff
+  data.tar.gz: ad6a2ace669c9e736451c16c0be0b523ac24fd11
 SHA512:
-  metadata.gz: 311b9232ca6168cb33c3a2ee97cdfe793be6d29904f82e1a78cb863c84dce4e5992d8d529b6ac0c9d47d58aec3417902a50053a1490629f99d3b554f79e05278
-  data.tar.gz: 671e7b5fceb741dac1ef521f985bf352e83fabe6a9a79030baf9fbb865eba0c0c69e26103a063a47933def4fb71f6f731bf42abb5c89441bc41d06e67308a283
+  metadata.gz: f7f95bc00fbf33318348b7f95c6bf019f115c10366b6f2a6d537f8f04ec048c977b9d33898cd6abd4711303e2acf2150a70aba3067f63795acf1b94a62912118
+  data.tar.gz: 6229352a202ef5495e88c826e9d5548418a9f4035cc2134df2c5b6814a7cbaf606f94e958df118490e670b992229808b3622b60dfb00da796b9664a361b355b8

data/bin/autoproj_bootstrap

@@ -341,7 +341,6 @@ if defined?(Bundler)
     end
 end
 
-ENV.delete('BUNDLE_GEMFILE')
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -546,13 +545,13 @@ require 'bundler/setup'
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options, '--debug')
+                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     STDERR.puts "failed to run autoproj envsh on the newly installed autoproj (#{autoproj_path})"
                     exit 1
                 end
                 # This is really needed on an existing install to install the
                 # gems that were present in the v1 layout
-                if !system(Gem.ruby, autoproj_path, 'osdeps', '--debug')
+                if !system(Gem.ruby, autoproj_path, 'osdeps')
                     STDERR.puts "failed to run autoproj osdeps on the newly installed autoproj (#{autoproj_path})"
                     exit 1
                 end

data/bin/autoproj_install

@@ -341,7 +341,6 @@ if defined?(Bundler)
     end
 end
 
-ENV.delete('BUNDLE_GEMFILE')
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -546,13 +545,13 @@ require 'bundler/setup'
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options, '--debug')
+                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     STDERR.puts "failed to run autoproj envsh on the newly installed autoproj (#{autoproj_path})"
                     exit 1
                 end
                 # This is really needed on an existing install to install the
                 # gems that were present in the v1 layout
-                if !system(Gem.ruby, autoproj_path, 'osdeps', '--debug')
+                if !system(Gem.ruby, autoproj_path, 'osdeps')
                     STDERR.puts "failed to run autoproj osdeps on the newly installed autoproj (#{autoproj_path})"
                     exit 1
                 end

data/lib/autoproj/cli/osdeps.rb

@@ -14,6 +14,7 @@ def run(user_selection, options = Hash.new)
                     shell_helpers: ws.config.shell_helpers?
                 ws.install_os_packages(
                     osdep_packages,
+                    run_package_managers_without_packages: true,
                     install_only: !options[:update])
                 ws.export_env_sh(shell_helpers: options[:shell_helpers])
             end

data/lib/autoproj/ops/install.rb

@@ -331,7 +331,6 @@ def self.shim_bundler(ruby_executable, autoproj_gemfile_path, gems_gem_home)
     end
 end
 
-ENV.delete('BUNDLE_GEMFILE')
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -536,13 +535,13 @@ def stage2(*vars)
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options, '--debug')
+                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     STDERR.puts "failed to run autoproj envsh on the newly installed autoproj (#{autoproj_path})"
                     exit 1
                 end
                 # This is really needed on an existing install to install the
                 # gems that were present in the v1 layout
-                if !system(Gem.ruby, autoproj_path, 'osdeps', '--debug')
+                if !system(Gem.ruby, autoproj_path, 'osdeps')
                     STDERR.puts "failed to run autoproj osdeps on the newly installed autoproj (#{autoproj_path})"
                     exit 1
                 end

data/lib/autoproj/os_package_installer.rb

@@ -315,7 +315,7 @@ def pristine(packages, options = Hash.new)
         end
 
         # Requests the installation of the given set of packages
-        def install(osdep_packages, install_only: false, **options)
+        def install(osdep_packages, install_only: false, run_package_managers_without_packages: false, **options)
             osdep_packages = osdep_packages.to_set - installed_packages
 
             setup_package_managers(**options)
@@ -342,7 +342,8 @@ def install(osdep_packages, install_only: false, **options)
             [os_packages, other_packages].each do |packages|
                 packages.each do |handler, list|
                     list = list.to_set - installed_resolved_packages[handler]
-                    next if list.empty? && !handler.call_while_empty?
+                    next if !run_package_managers_without_packages ||
+                        (list.empty? && !handler.call_while_empty?)
 
                     handler.install(
                         list.to_a,

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc33"
+    VERSION = "2.0.0.rc34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc33
+  version: 2.0.0.rc34
 platform: ruby
 authors:
 - Sylvain Joyeux