bin/autoproj_bootstrap in autoproj-2.0.0.rc6 vs bin/autoproj_bootstrap in autoproj-2.0.0.rc8

@@ -1,9 +1,9 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.9.2"
-    STDERR.puts "autoproj requires Ruby >= 1.9.2"
+if RUBY_VERSION < "2.0.0"
+    STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
 end
 
 require 'pathname'
 require 'optparse'
@@ -411,16 +411,16 @@
                 install
 
                 clean_env = env_for_child
                 stage2_vars = clean_env.map { |k, v| "#{k}=#{v}" }
                 puts "starting the newly installed autoproj for stage2 install"
-                puts [clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
+                result = system clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
                     Gem.ruby, File.join(autoproj_install_dir, 'bin', 'autoproj'),
-                    'install-stage2', root_dir, *stage2_vars].inspect
-                exec clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, File.join(autoproj_install_dir, 'bin', 'autoproj'),
                     'install-stage2', root_dir, *stage2_vars
+                if !result
+                    raise "failed to execute autoproj install-stage2"
+                end
             end
 
             def stage2(*vars)
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
@@ -432,12 +432,14 @@
     end
 end
 
 
 
+ENV.delete('BUNDLE_GEMFILE')
+ENV.delete('RUBYLIB')
 ops = Autoproj::Ops::Install.new(Dir.pwd)
-bootstrap_options = ops.parse_options(ARGV)
-ops.run
+ops.parse_options(ARGV)
+ops.stage1
 
 # we assume that Install#run loads bundler and autobuild. Load autoproj and run
 # bootstrap
 require 'autoproj/cli/main'
 Autoproj::CLI::Main.start(['bootstrap', *bootstrap_options])