lib/autoproj/cli/update.rb in autoproj-2.0.0.rc13 vs lib/autoproj/cli/update.rb in autoproj-2.0.0.rc14

@@ -33,33 +33,33 @@
 
                 return packages, options
             end
 
             def run(selected_packages, options)
+                explicit_selection = !selected_packages.empty?
                 selected_packages, config_selected =
                     normalize_command_line_package_selection(selected_packages)
 
                 # Autoproj and configuration are updated only if (1) it is
                 # explicitely selected or (2) nothing is explicitely selected
                 update_autoproj =
                     (options[:autoproj] || (
                         options[:autoproj] != false &&
-                        selected_packages.empty? &&
+                        !explicit_selection &&
                         !options[:config] && 
                         !options[:checkout_only])
                     )
 
                 update_config =
-                    (options[:config] || (
+                    (options[:config] || config_selected || (
                         options[:config] != false &&
-                        selected_packages.empty? &&
-                        !options[:autoproj]) ||
-                    config_selected)
+                        !explicit_selection &&
+                        !options[:autoproj]))
 
                 update_packages =
                     options[:all] ||
-                    !selected_packages.empty? ||
-                    (!options[:config] && !options[:autoproj])
+                    (explicit_selection && !selected_packages.empty?) ||
+                    (!explicit_selection && !options[:config] && !options[:autoproj])
 
                 ws.setup
                 parallel = options[:parallel] || ws.config.parallel_import_level
 
                 ws.autodetect_operating_system(force: true)