From 174b4f01297306baf135229cfefcfd7c081cdd49 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Wed, 23 Apr 2008 09:38:00 +0000 Subject: [PATCH] - schubi convinced me to invert the flag, so that installed packages are added by default --- src/solver.c | 10 +++++----- src/solver.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/solver.c b/src/solver.c index 17a6d2d..774de37 100644 --- a/src/solver.c +++ b/src/solver.c @@ -3592,7 +3592,7 @@ solver_solve(Solver *solv, Queue *job) /* find recommended packages */ /* if redoq.count == 0 we already found all recommended in the * solver run */ - if (redoq.count || solv->dontinstallrecommended || solv->showinstalledrecommended) + if (redoq.count || solv->dontinstallrecommended || !solv->dontshowinstalledrecommended) { Id rec, *recp, p, *pp; @@ -3615,7 +3615,7 @@ solver_solve(Solver *solv, Queue *job) break; if (p) { - if (solv->showinstalledrecommended) + if (!solv->dontshowinstalledrecommended) { FOR_PROVIDES(p, pp, rec) if (solv->decisionmap[p] > 0) @@ -3632,7 +3632,7 @@ solver_solve(Solver *solv, Queue *job) { if (solv->decisionmap[i] < 0) continue; - if (solv->decisionmap[i] > 0 && !solv->showinstalledrecommended) + if (solv->decisionmap[i] > 0 && solv->dontshowinstalledrecommended) continue; s = pool->solvables + i; if (!MAPTST(&solv->recommendsmap, i)) @@ -3677,7 +3677,7 @@ solver_solve(Solver *solv, Queue *job) break; if (p) { - if (solv->showinstalledrecommended) + if (!solv->dontshowinstalledrecommended) { FOR_PROVIDES(p, pp, sug) if (solv->decisionmap[p] > 0) @@ -3694,7 +3694,7 @@ solver_solve(Solver *solv, Queue *job) { if (solv->decisionmap[i] < 0) continue; - if (solv->decisionmap[i] > 0 && !solv->showinstalledrecommended) + if (solv->decisionmap[i] > 0 && solv->dontshowinstalledrecommended) continue; s = pool->solvables + i; if (!MAPTST(&solv->suggestsmap, i)) diff --git a/src/solver.h b/src/solver.h index df5f35b..6e71615 100644 --- a/src/solver.h +++ b/src/solver.h @@ -128,7 +128,7 @@ typedef struct solver { int noupdateprovide; /* true: update packages needs not to provide old package */ int dosplitprovides; /* true: consider legacy split provides */ int dontinstallrecommended; /* true: do not install recommended packages */ - int showinstalledrecommended; /* true: add recommened packages that are already installed to the lists */ + int dontshowinstalledrecommended; /* true: do not show recommended packages that are already installed */ /* Callbacks for defining the bahaviour of the SAT solver */ -- 2.7.4