Fix cases where incorrect action is stored by set_action()

set_action() with action = Install_action and desired = empty version
when curr = empty version is equivalent to action = NoChange_Action.

(This can occur if we are selecting a category for install on the
command line, and that category happens to include a package which only
has a test version, but no current version)

(For completeness, also address the case of action = Install_action,
desired = empty_version, where curr = some version is equivalent to
action = Uninstall_action)

diff --git a/package_meta.cc b/package_meta.cc
index 940f69a6d19910168bd08609756e1b7e160d8467..1f6ab1676f923731bcf4fab7981e6d325979cff8 100644 (file)
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -549,30 +549,31 @@ packagemeta::set_action (_actions action, packageversion const &default_version,
   else if (action == Install_action)
     {
       desired = default_version;
-      if (desired)
-       {
-         if (desired != installed)
-           if (desired.accessible ())
-             {
-               /* Memorize the fact that the user picked to install this package at least once. */
-               if (useraction)
-                 user_picked = true;
-
-               pick (true);
-               srcpick (false);
-             }
-           else
-             {
-               pick (false);
-               srcpick (true);
-             }
-         else
-           {
-             action = NoChange_action;
-             pick (false);
-             srcpick (false);
-           }
-       }
+      if (desired != installed)
+        if (desired.accessible ())
+          {
+            /* Memorize the fact that the user picked to install this package at least once. */
+            if (useraction)
+              user_picked = true;
+
+            pick (true);
+            srcpick (false);
+
+            /* Install no version is Uninstall */
+            if (!desired)
+              action = Uninstall_action;
+          }
+        else
+          {
+            pick (false);
+            srcpick (true);
+          }
+      else
+        {
+          action = NoChange_action;
+          pick (false);
+          srcpick (false);
+        }
     }
   else if (action == Reinstall_action)
     {