]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
do not add back cleandeps_updatepkgs packages [bnc#841781]
authorMichael Schroeder <mls@suse.de>
Mon, 23 Sep 2013 14:34:25 +0000 (16:34 +0200)
committerMichael Schroeder <mls@suse.de>
Mon, 23 Sep 2013 14:34:25 +0000 (16:34 +0200)
src/rules.c

index af3b6b181ccf3453f7a5d2e85af9539f7d450aba..59272fd4c0b642280e98d683832b43d868264c12 100644 (file)
@@ -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))