autoproj_bootstrap in autoproj-1.13.0

- old
+ new

@@ -825,16 +825,11 @@
                 # TODO there might be duplicates in packages which should be fixed
                 # somewhere else
                 packages = packages.uniq
                 result = `brew info --json=v1 '#{packages.join("' '")}'`
                 result = begin
-                             result = JSON.parse(result)
-                             if packages.size == 1
-                                 [result]
-                             else
-                                 result
-                             end
+                             JSON.parse(result)
                          rescue JSON::ParserError
                              if result && !result.empty?
                                  Autoproj.warn "Error while parsing result of brew info --json=v1"
                              else
                                  # one of the packages is unknown fallback to install all
@@ -3148,14 +3143,16 @@
 
 # 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')
+    if ARGV.first == "dev"
         ENV['AUTOPROJ_USE_PRERELEASE'] = '1'
-        Autoproj::PackageManagers::GemManager.with_prerelease = true
         ARGV.shift
     end
+
+    Autoproj::PackageManagers::GemManager.with_prerelease =
+        (ENV['AUTOPROJ_USE_PRERELEASE'] == '1')
     begin
         osdeps_management.install(['autobuild'])
         osdeps_management.install(['autoproj'])
     rescue Autoproj::ConfigError => e
         STDERR.puts "failed: #{e.message}"