From: Michael Schroeder <mls@suse.de>
Date: Wed, 23 Apr 2008 09:38:00 +0000 (+0000)
Subject: - schubi convinced me to invert the flag, so that installed
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~389
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=174b4f01297306baf135229cfefcfd7c081cdd49;p=thirdparty%2Flibsolv.git

- schubi convinced me to invert the flag, so that installed
  packages are added by default
---

diff --git a/src/solver.c b/src/solver.c
index 17a6d2d3..774de374 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 df5f35bd..6e716156 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 */