2001-11-10 Robert Collins <rbtcollins@hotmail.com>

        * choose.cc (set_cation): Backout last change.
        (choose_caption): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 8e1daddaa884a663dfdb9d467159c2935da70616..fd557209a92c6d2369bca0e878933c49a4de287f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-10  Robert Collins  <rbtcollins@hotmail.com>
+
+       * choose.cc (set_cation): Backout last change.
+       (choose_caption): Ditto.
+
 2001-11-10  Robert Collins  <rbtcollins@hotmail.com>
 
        * ini.h (actions): Remove - transferred to choose.h.

diff --git a/choose.cc b/choose.cc
index 9d67d39700ff3ac913c4f848240e257dc7cfb54d..d6ebf7d62a69cb0dc2e8f08df89399e622c48fa0 100644 (file)
--- a/choose.cc
+++ b/choose.cc
@@ -147,11 +147,6 @@ set_action (Package * pkg, bool preinc)
        break;
        /* ACTION_SAME_* are used when the installed version is the same
           as the given action. */
-      case ACTION_SAME:
-       if (pkg->installed && !pkg->installed_ix)
-         /* the package is installed, but we don't have 
-          * that version it in our version list */
-         return;
       case ACTION_SAME_CURR:
       case ACTION_SAME_TEST:
        if (!preinc)            /* Previously set to this value */
@@ -274,7 +269,6 @@ choose_caption (Package * pkg)
     case ACTION_TEST:
       pkg->trust = (trusts) pkg->action;
       return pkg->info[pkg->trust].version;
-    case ACTION_SAME:
     case ACTION_SAME_PREV:
     case ACTION_SAME_CURR:
     case ACTION_SAME_TEST: