From: Michael Schroeder Date: Wed, 15 Jun 2016 15:22:27 +0000 (+0200) Subject: do not auto-minimize for recommended packages if the current selection is favored X-Git-Tag: 0.6.23~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9df65930b2ad0ea22017af791277356cd49fb5fc;p=thirdparty%2Flibsolv.git do not auto-minimize for recommended packages if the current selection is favored --- diff --git a/src/solver.c b/src/solver.c index d6023b0b..5fca20d1 100644 --- a/src/solver.c +++ b/src/solver.c @@ -2927,6 +2927,9 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) p = -solv->branches.elements[i]; if (p <= 0 || solv->decisionmap[p] != l + 1) continue; + if (solv->favormap.size && MAPTST(&solv->favormap, p)) + if (!(solv->isdisfavormap.size && MAPTST(&solv->isdisfavormap, p))) + continue; /* current selection is favored */ if (!(MAPTST(&solv->recommendsmap, p) || solver_is_supplementing(solv, pool->solvables + p))) { lasti = lastsi;