From: Michael Schroeder Date: Mon, 11 Sep 2017 14:51:49 +0000 (+0200) Subject: Do not even try to remove not-considered packages in cleandeps X-Git-Tag: 0.6.30~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd2cb61433f9a0051e579cc59287d6eab73c144;p=thirdparty%2Flibsolv.git Do not even try to remove not-considered packages in cleandeps Should make things a bit faster. --- diff --git a/src/rules.c b/src/rules.c index 01f6fd6a..7206ebbd 100644 --- a/src/rules.c +++ b/src/rules.c @@ -4278,6 +4278,8 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) if (pool->solvables[p].repo != installed) continue; MAPSET(&installedm, p); + if (pool->considered && !MAPTST(pool->considered, p)) + MAPSET(&userinstalled, p - installed->start); /* we may not remove those */ if (unneeded && !MAPTST(&userinstalled, p - installed->start)) continue; MAPSET(&im, p); @@ -4610,7 +4612,7 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) { if (pool->solvables[p].repo != installed) continue; - if (pool->considered != NULL && !MAPTST(pool->considered, p)) + if (pool->considered && !MAPTST(pool->considered, p)) continue; if (!MAPTST(&im, p)) MAPSET(cleandepsmap, p - installed->start);