From: Michael Schroeder <mls@suse.de>
Date: Mon, 23 Sep 2013 14:34:25 +0000 (+0200)
Subject: do not add back cleandeps_updatepkgs packages [bnc#841781]
X-Git-Tag: upstream/0.6.4~209
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=388fa5c318586b1fec7a8b8d0b9fb35e7e5d874a;p=platform%2Fupstream%2Flibsolv.git

do not add back cleandeps_updatepkgs packages [bnc#841781]
---

diff --git a/src/rules.c b/src/rules.c
index af3b6b1..59272fd 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -3338,6 +3338,15 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded)
       if (pool->solvables[p].repo == installed)
         MAPSET(&userinstalled, p - installed->start);
     }
+  if (!unneeded && solv->cleandeps_updatepkgs)
+    {
+      for (i = 0; i < solv->cleandeps_updatepkgs->count; i++)
+	{
+	  p = solv->cleandeps_updatepkgs->elements[i];
+	  if (pool->solvables[p].repo == installed)
+	    MAPSET(&userinstalled, p - installed->start);
+	}
+    }
   MAPSET(&im, SYSTEMSOLVABLE);	/* in case we cleared it above */
   for (p = installed->start; p < installed->end; p++)
     if (MAPTST(&im, p))