]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
do not auto-minimize for recommended packages if the current selection is favored
authorMichael Schroeder <mls@suse.de>
Wed, 15 Jun 2016 15:22:27 +0000 (17:22 +0200)
committerMichael Schroeder <mls@suse.de>
Wed, 15 Jun 2016 15:22:27 +0000 (17:22 +0200)
src/solver.c

index d6023b0bf401a0af321b811f725be8cdf6e6a690..5fca20d1408901afe05b1474a2c2e44e7cb49463 100644 (file)
@@ -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;