bin/autoproj_install in autoproj-2.0.0.rc33 vs bin/autoproj_install in autoproj-2.0.0.rc34

@@ -339,11 +339,10 @@
     Bundler.with_clean_env do
         exec($0, *ARGV)
     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' => '']
 
 load Gem.bin_path('bundler', 'bundler')"
@@ -544,16 +543,16 @@
 
             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
             end
         end