autoproj_bootstrap in autoproj-1.7.10

- old
+ new

@@ -194,11 +194,11 @@
             @definitions = definitions.merge(info.definitions) do |h, v1, v2|
                 if v1 != v2
                     root_dir ||= "#{Autoproj.root_dir}/"
                     old = source_of(h).gsub(root_dir, '')
                     new = info.source_of(h).gsub(root_dir, '')
-                    Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overriden by #{new}")
+                    Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overridden by #{new}")
                 end
                 v2
             end
             @sources = sources.merge(info.sources)
             @all_definitions = all_definitions.merge(info.all_definitions) do |package_name, all_defs, new_all_defs|
@@ -357,11 +357,11 @@
                             is_installed = false
                         end
                     elsif line =~ /Package: (.*)$/
                         current_packages << $1
                     elsif line =~ /Provides: (.*)$/
-                        current_packages << $1
+                        current_packages.concat($1.split(',').map(&:strip))
                     elsif line == "Status: install ok installed"
                         is_installed = true
                     end
                 end
             end
@@ -939,11 +939,11 @@
     The following command line can be used to install them manually
     
       #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
     
     Autoproj expects these Gems to be installed in #{Autoproj.gem_home} This can
-    be overriden by setting the AUTOPROJ_GEM_HOME environment variable manually
+    be overridden by setting the AUTOPROJ_GEM_HOME environment variable manually
 
             EOMSG
             print "    #{Autoproj.color("Press ENTER to continue ", :bold)}"
 
             STDOUT.flush
@@ -1525,10 +1525,15 @@
 # aren't installing any gems for now (as we need to choose the right gem
 # binary) by setting Autobuild.programs['gem'] to nil
 Autobuild.programs['gem'] = nil
 Autoproj::OSDependencies.autodetect_ruby
 
-osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
+osdeps_management = 
+    if ENV['AUTOPROJ_DEFAULT_OSDEPS']
+        Autoproj::OSDependencies.load(ENV['AUTOPROJ_DEFAULT_OSDEPS'])
+    else
+        Autoproj::OSDependencies.new(YAML.load(DEFS))
+    end
 osdeps_management.silent = false
 
 begin
     STDERR.puts "autoproj: installing a proper Ruby environment (this can take a long time)"
     osdeps_management.install(['ruby'])