From: Robert Collins <rbtcollins@hotmail.com>
Date: Fri, 2 Nov 2001 03:29:00 +0000 (+0000)
Subject: 2001-11-02  Robert Collins  <rbtcollins@hotmail.com>
X-Git-Tag: Z-categories_merge_HEAD~5
X-Git-Url: https://cygwin.com/git/?a=commitdiff_plain;h=878faffda5656098d674dd15d77f6986586323c9;p=cygwin-apps%2Fsetup.git

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 cfe510a5..1a76cd89 100644
--- 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 fb602a28..a970eb66 100644
--- 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, */