autoproj_bootstrap in autoproj-1.9.7.rc16

- old
+ new

@@ -618,11 +618,18 @@
                     if !installed.empty? && Autobuild.do_update
                         # Look if we can update the package ...
                         dep = Gem::Dependency.new(name, version_requirements)
                         available =
                             if gem_fetcher.respond_to?(:find_matching)
-                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease).map(&:first)
+                                non_prerelease, _ = gem_fetcher.find_matching(dep, false, true).first
+                                if GemManager.with_prerelease
+                                    prerelease, _ = gem_fetcher.find_matching(dep, false, true, true).last
+                                end
+                                [non_prerelease, prerelease].
+                                    compact.
+                                    map { |name, version, _| [name, version] }
+
                             else # Post RubyGems-2.0
                                 type = if GemManager.with_prerelease then :complete
                                        else :released
                                        end
 
@@ -2517,10 +2524,10 @@
 # If the user specifies "dev" on the command line, install the prerelease
 # version of autoproj. If it is "localdev", expect him to install autoproj and
 # run autoproj bootstrap manually.
 if ARGV.first != "localdev"
     if ARGV.first == "dev"
-        ENV['AUTOPROJ_USE_PRERELEASE'] = 1
+        ENV['AUTOPROJ_USE_PRERELEASE'] = '1'
         Autoproj::PackageManagers::GemManager.with_prerelease = true
         ARGV.shift
     end
     begin
         osdeps_management.install(['build-essential'])