Author: mlschroe Date: Wed Apr 23 11:38:00 2008 New Revision: 9802 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9802&view=rev Log: - schubi convinced me to invert the flag, so that installed packages are added by default Modified: trunk/sat-solver/src/solver.c trunk/sat-solver/src/solver.h Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=9802&r1=9801&r2=9802&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Apr 23 11:38:00 2008 @@ -3592,7 +3592,7 @@ /* 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 @@ break; if (p) { - if (solv->showinstalledrecommended) + if (!solv->dontshowinstalledrecommended) { FOR_PROVIDES(p, pp, rec) if (solv->decisionmap[p] > 0) @@ -3632,7 +3632,7 @@ { 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 @@ break; if (p) { - if (solv->showinstalledrecommended) + if (!solv->dontshowinstalledrecommended) { FOR_PROVIDES(p, pp, sug) if (solv->decisionmap[p] > 0) @@ -3694,7 +3694,7 @@ { 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)) Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=9802&r1=9801&r2=9802&view=diff ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Wed Apr 23 11:38:00 2008 @@ -128,7 +128,7 @@ 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 */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org