From 50126b5664a9dc5089911a5354d76febc6ed1a77 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Wed, 2 Mar 2011 12:00:57 +0100 Subject: [PATCH] - ignore to be dropped orhaned packages when calculating candidates for recommends/supplements installation --- package/libsatsolver.changes | 6 ++++++ src/solver.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index c20ec061..7ce87f43 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 17:44:05 CET 2011 - mls@suse.de + +- ignore to be dropped orhaned packages when calculating + candidates for recommends/supplements installation + ------------------------------------------------------------------- Wed Feb 2 09:24:42 UTC 2011 - kkaempf@novell.com diff --git a/src/solver.c b/src/solver.c index 7cefd1a5..f188026d 100644 --- a/src/solver.c +++ b/src/solver.c @@ -1722,6 +1722,8 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) } else if (solv->decisionmap[p] == 0) { + if (solv->dupmap_all && solv->installed && pool->solvables[p].repo == solv->installed && (solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, p - solv->installed->start)))) + continue; queue_pushunique(&dq, p); } } @@ -1737,6 +1739,8 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) continue; if (!solver_is_supplementing(solv, s)) continue; + if (solv->dupmap_all && solv->installed && s->repo == solv->installed && (solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, i - solv->installed->start)))) + continue; queue_push(&dqs, i); } } -- 2.47.3