autoproj_bootstrap in autoproj-2.0.0.rc9

- old
+ new

@@ -238,11 +238,11 @@
             end
 
             def install_autoproj(bundler)
                 # Force bundler to update. If the user does not want this, let him specify a
                 # Gemfile with tighter version constraints
-                lockfile = File.join(File.dirname(autoproj_install_dir), 'Gemfile.lock')
+                lockfile = File.join(autoproj_install_dir, 'Gemfile.lock')
                 if File.exist?(lockfile)
                     FileUtils.rm lockfile
                 end
 
                 opts = Array.new
@@ -435,10 +435,10 @@
 
 
 ENV.delete('BUNDLE_GEMFILE')
 ENV.delete('RUBYLIB')
 ops = Autoproj::Ops::Install.new(Dir.pwd)
-ops.parse_options(ARGV)
+bootstrap_options = ops.parse_options(ARGV)
 ops.stage1
 
 # we assume that Install#run loads bundler and autobuild. Load autoproj and run
 # bootstrap
 require 'autoproj/cli/main'