autoproj_bootstrap in autoproj-1.8.2.b12

- old
+ new

@@ -946,10 +946,11 @@
         # nonexistent keyword was found, and FOUND_PACKAGES if either packages
         # or the ignore keyword were found.
         #
         def partition_osdep_entry(osdep_name, dep_def, handler_names, excluded, *keys)
             keys, *additional_keys = *keys
+            keys ||= []
             found = false
             nonexistent = false
             result = []
             found_keys = Hash.new
             Array(dep_def).each do |names, values|
@@ -977,11 +978,11 @@
                         if rec_found == FOUND_NONEXISTENT then nonexistent = true
                         elsif rec_found == FOUND_PACKAGES then found = true
                         end
                         result.concat(rec_result)
                     end
-                elsif keys
+                else
                     if names.respond_to?(:to_str) # names could be an array already
                         names = names.split(',')
                     end
 
                     if handler_names
@@ -1745,88 +1746,88 @@
     @root_dir = Dir.pwd
 end
 
 DEFS = <<EODEFS
 --- 
+zlib: 
+  debian,ubuntu: zlib1g-dev
+git: 
+  arch: git
+  ubuntu: git-core
+  debian: 
+    default: git-core
+    lenny: git
+  gentoo: dev-vcs/git
 cvs: 
   debian,ubuntu: cvs
+cmake: 
+  arch: cmake
+  gentoo: dev-util/cmake
+  debian,ubuntu: cmake
+build-essential: 
+  arch: ignore
+  gentoo: ignore
+  debian,ubuntu: build-essential
 autoproj: gem
-zlib: 
-  debian,ubuntu: zlib1g-dev
+autobuild: gem
+lsb_release: 
+  arch: ignore
+  gentoo: sys-apps/lsb-release
+  debian,ubuntu: lsb-release
+none: ignore
+svn: 
+  arch: subversion
+  gentoo: dev-util/subversion
+  debian,ubuntu: subversion
+archive: 
+  arch: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+  debian,ubuntu: 
+  - tar
+  - unzip
+autotools: 
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
 ruby19: 
+  arch: 
+  - ruby
+  - rake
   ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - ri1.9.1
   - libopenssl-ruby1.9.1
   - rake
-  arch: 
-  - ruby
-  - rake
-  gentoo: 
-  - dev-lang/ruby:1.9
-  - rake
   debian: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - rake
   - rubygems-integration
+  gentoo: 
+  - dev-lang/ruby:1.9
+  - rake
 ruby18: 
+  gentoo: 
+  - dev-lang/ruby:1.8
+  - rake
   debian,ubuntu: 
   - ruby1.8-dev
   - ruby1.8
   - rubygems1.8
   - ri1.8
   - libopenssl-ruby1.8
   - rake
-  gentoo: 
-  - dev-lang/ruby:1.8
-  - rake
-archive: 
-  debian,ubuntu: 
-  - tar
-  - unzip
-  arch: 
-  - tar
-  - unzip
-  gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-cmake: 
-  debian,ubuntu: cmake
-  arch: cmake
-  gentoo: dev-util/cmake
-build-essential: 
-  debian,ubuntu: build-essential
-  arch: ignore
-  gentoo: ignore
-svn: 
-  debian,ubuntu: subversion
-  arch: subversion
-  gentoo: dev-util/subversion
-none: ignore
-lsb_release: 
-  debian,ubuntu: lsb-release
-  arch: ignore
-  gentoo: sys-apps/lsb-release
-autotools: 
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-  arch: automake autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-git: 
-  ubuntu: git-core
-  arch: git
-  gentoo: dev-vcs/git
-  debian: 
-    default: git-core
-    lenny: git
-autobuild: gem
 
 EODEFS
 
 Autoproj::OSDependencies.define_osdeps_mode_option
 osdeps_mode = Autoproj::OSDependencies.osdeps_mode