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

        * choose.cc (add_required): Allow SKIP and SRC_ONLY for currently installed
        packages.

diff --git a/ChangeLog b/ChangeLog
index cfe510a5a8175a12c297e3426f58c1fc793ba8eb..1a76cd89d0b78a98e1137e68d220d368214491a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-02  Robert Collins  <rbtcollins@hotmail.com>
+
+       * choose.cc (add_required): Allow SKIP and SRC_ONLY for currently installed 
+       packages.
+
 2001-11-02  Robert Collins  <rbtcollins@hotmail.com>
 
        * choose.cc (default_trust): Autoset currently installed packages per the user's

diff --git a/choose.cc b/choose.cc
index fb602a284357e3fed03057f9e86b76aa2158d2f7..a970eb6675444921de3216f9945a0639c3e02e2f 100644 (file)
--- a/choose.cc
+++ b/choose.cc
@@ -229,10 +229,12 @@ add_required (Package *pkg)
          /* it's already installed - leave it */
          required->action = (actions) required->installed_ix;
          break;
+       case ACTION_SKIP:
+       case ACTION_SRC_ONLY:
+         if (required->installed)
+           break;
        case ACTION_ERROR:
        case ACTION_UNKNOWN:
-       case ACTION_SRC_ONLY:
-       case ACTION_SKIP:
          /* the current install will fail */
          required->action = ACTION_UNKNOWN; /* this find prev, then curr, then test. */
          set_action(required, 0);        /* we need a find_best that gets installed, */