lib/autoproj/cli/build.rb in autoproj-2.0.0.rc38 vs lib/autoproj/cli/build.rb in autoproj-2.0.0.rc39

@@ -3,15 +3,13 @@
 
 module Autoproj
     module CLI
         class Build < Update
             def validate_options(selected_packages, options)
-                selected_packages, options = super
-                if options[:amake] && selected_packages.empty? && !options[:all]
-                    selected_packages = ['.']
-                end
-
+                selected_packages, options =
+                    super(selected_packages, options.merge(
+                        checkout_only: true, aup: options[:amake]))
                 if options[:deps].nil?
                     options[:deps] = 
                         !(options[:rebuild] || options[:force])
                 end
                 return selected_packages, options
@@ -21,12 +19,10 @@
                 build_options, options = filter_options options,
                     force: false,
                     rebuild: false,
                     parallel: nil
 
-                Autobuild.ignore_errors = options[:keep_going]
-
                 command_line_selection, source_packages, osdep_packages =
                     super(selected_packages, options.merge(checkout_only: true))
 
                 parallel = build_options[:parallel] || ws.config.parallel_build_level
 
@@ -35,9 +31,11 @@
                 # Disable all packages that are not selected
                 ws.manifest.each_autobuild_package do |pkg|
                     next if source_packages.include?(pkg.name)
                     pkg.disable
                 end
+
+                Autobuild.ignore_errors = options[:keep_going]
 
                 ops = Ops::Build.new(ws.manifest)
                 if build_options[:rebuild] || build_options[:force]
                     packages_to_rebuild =
                         if options[:deps] || command_line_selection.empty?