X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fproblems.c;h=df751c4fae884d0d215e9453c74b605ad7b1bd83;hb=2491213c77850ed26991b572809a5ca4a61fa89b;hp=2b5cefda3ca00956ec7057eeebd1f73b51632bd4;hpb=0e46e80434781d1acbc4f5716827bf8688450a30;p=platform%2Fupstream%2Flibsolv.git diff --git a/src/problems.c b/src/problems.c index 2b5cefd..df751c4 100644 --- a/src/problems.c +++ b/src/problems.c @@ -247,23 +247,8 @@ solver_autouninstall(Solver *solv, int start) if (v >= solv->updaterules && v < solv->updaterules_end) { Rule *r; - Id p = solv->installed->start + (v - solv->updaterules); if (m && !MAPTST(m, v - solv->updaterules)) continue; - if (pool->considered && !MAPTST(pool->considered, p)) - continue; /* do not uninstalled disabled packages */ - if (solv->bestrules_pkg && solv->bestrules_end > solv->bestrules) - { - int j; - for (j = start + 1; j < solv->problems.count - 1; j++) - { - Id vv = solv->problems.elements[j]; - if (vv >= solv->bestrules && vv < solv->bestrules_end && solv->bestrules_pkg[vv - solv->bestrules] == p) - break; - } - if (j < solv->problems.count - 1) - continue; /* best rule involved, do not uninstall */ - } /* check if identical to feature rule, we don't like that (except for orphans) */ r = solv->rules + solv->featurerules + (v - solv->updaterules); if (!r->p) @@ -275,7 +260,7 @@ solver_autouninstall(Solver *solv, int start) if (solv->keep_orphans) { r = solv->rules + v; - if (!r->d && !r->w2 && r->p == p) + if (!r->d && !r->w2 && r->p == (solv->installed->start + (v - solv->updaterules))) { lastfeature = v; lastupdate = 0;