autoproj_bootstrap in autoproj-1.10.rc1

- old
+ new

@@ -1,9 +1,9 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.8.7"
-    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+if RUBY_VERSION < "1.9.2"
+    STDERR.puts "autoproj requires Ruby >= 1.9.2"
     exit 1
 end
 
 if defined? Encoding # This is a 1.9-only thing
     Encoding.default_internal = Encoding::UTF_8
@@ -637,11 +637,11 @@
                 orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(File::PATH_SEPARATOR)
                 Autobuild::SYSTEM_ENV['GEM_PATH'] = Gem.default_path
                 Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(File::PATH_SEPARATOR)
 
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
-                    p_gems = File.join(Autoproj.root_dir, '.gems')
+                    p_gems = File.join(p, '.gems')
                     if File.directory?(p_gems)
                         Autobuild.env_add_path 'GEM_PATH', p_gems
                     end
                 end
                 Autobuild.env_add_path 'GEM_PATH', gem_home
@@ -2204,11 +2204,10 @@
 
     def self.has_config_key?(name)
         @user_config.has_key?(name)
     end
 
-    def self.load_config
-        config_file = File.join(Autoproj.config_dir, "config.yml")
+    def self.load_config(config_file = File.join(Autoproj.config_dir, "config.yml"))
         if File.exists?(config_file)
             config = YAML.load(File.read(config_file))
             if !config
                 return
             end