bin/autoproj_bootstrap in autoproj-2.8.5 vs bin/autoproj_bootstrap in autoproj-2.8.6

@@ -422,10 +422,13 @@
     Bundler.with_clean_env do
         exec($0, *ARGV)
     end
 end
 ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+ENV['GEM_HOME'] = '#{gems_gem_home}'
+ENV.delete('GEM_PATH')
+Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
                 RESTART_BUNDLER
                 script_lines.join
             end
 
             def self.shim_bundler_old(ruby_executable, autoproj_gemfile_path, gems_gem_home)
@@ -469,9 +472,10 @@
     exec(Hash['RUBYLIB' => nil], $0, *ARGV)
 end
 
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
 ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
+Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
                 AUTOPROJ_PREAMBLE
                 return script_lines.join
             end
 
             def self.shim_script_old(ruby_executable, root_dir, autoproj_gemfile_path,