lib/autoproj/cli/update.rb in autoproj-2.12.0 vs lib/autoproj/cli/update.rb in autoproj-2.12.1

@@ -197,13 +197,11 @@
                 from: nil, checkout_only: false, only_local: false, reset: false,
                 deps: true, keep_going: false, parallel: 1,
                 retry_count: 0, osdeps: true, auto_exclude: false, osdeps_options: Hash.new,
                 report: true)
 
-                if from
-                    setup_update_from(from)
-                end
+                setup_update_from(from) if from
 
                 ops = Autoproj::Ops::Import.new(
                     ws, report_path: (ws.import_report_path if report))
                 source_packages, osdep_packages =
                         ops.import_packages(selected_packages,
@@ -214,17 +212,18 @@
                                         keep_going: keep_going,
                                         parallel: parallel,
                                         retry_count: retry_count,
                                         install_vcs_packages: (osdeps_options if osdeps),
                                         auto_exclude: auto_exclude)
-                return source_packages, osdep_packages, nil
+                [source_packages, osdep_packages, nil]
             rescue ExcludedSelection => e
                 raise CLIInvalidSelection, e.message, e.backtrace
             rescue PackageImportFailed => import_failure
-                if !keep_going
-                    raise
-                end
-                return import_failure.source_packages, import_failure.osdep_packages, import_failure
+                raise unless keep_going
+
+                [import_failure.source_packages,
+                 import_failure.osdep_packages,
+                 import_failure]
             end
 
             def setup_update_from(other_root)
                 manifest.each_autobuild_package do |pkg|
                     if pkg.importer.respond_to?(:pick_from_autoproj_root)