autoproj 1.9.0.rc1 → 1.9.0.rc2

data/bin/autoproj_bootstrap

@@ -1517,7 +1517,7 @@ module Autoproj
 
         def ask(current_value, doc = nil)
             default_value =
-		if current_value then current_value.to_s
+		if !current_value.nil? then current_value.to_s
 		elsif options[:default] then options[:default].to_str
 		else ''
 		end

data/lib/autoproj/cmdline.rb

@@ -723,7 +723,16 @@ module Autoproj
                 manifest.install_os_dependencies(all_enabled_packages)
             end
 
-            if !selected_packages.empty? && !force_re_build_with_depends?
+            if selected_packages.empty? && Autobuild.do_rebuild
+                # If we don't have an explicit package selection, the handling
+                # of #prepare_for_rebuild is passed to Autobuild.apply. However,
+                # we want to make sure that the user really wants this
+                opt = BuildOption.new("", "boolean", {:doc => 'this is going to trigger a rebuild of all packages. Is that really what you want ?'}, nil)
+                if !opt.ask(false)
+                    raise Interrupt
+                end
+
+            elsif !selected_packages.empty? && !force_re_build_with_depends?
                 if Autobuild.do_rebuild
                     selected_packages.each do |pkg_name|
                         Autobuild::Package[pkg_name].prepare_for_rebuild

data/lib/autoproj/options.rb

@@ -47,7 +47,7 @@ module Autoproj
 
         def ask(current_value, doc = nil)
             default_value =
-		if current_value then current_value.to_s
+		if !current_value.nil? then current_value.to_s
 		elsif options[:default] then options[:default].to_str
 		else ''
 		end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.0.rc1"
+    VERSION = "1.9.0.rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.0.rc1
+  version: 1.9.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &18094640 !ruby/object:Gem::Requirement
+  requirement: &20707700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *18094640
+  version_requirements: *20707700
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &18093700 !ruby/object:Gem::Requirement
+  requirement: &20706440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *18093700
+  version_requirements: *20706440
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &18092320 !ruby/object:Gem::Requirement
+  requirement: &20705680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *18092320
+  version_requirements: *20705680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18091440 !ruby/object:Gem::Requirement
+  requirement: &20704480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *18091440
+  version_requirements: *20704480
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &18089940 !ruby/object:Gem::Requirement
+  requirement: &20703460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *18089940
+  version_requirements: *20703460
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.