- rename SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED to SOLVER_FLAG_ADD_ALREADY_RECOMMENDE...

Our policy is that the default should be zero and cover the most uses. Last chance
to do the change. (sorry libzypp and hawkeye folks.)

diff --git a/bindings/solv.i b/bindings/solv.i
index 1b080de4a90bc68e96edbd596e86756266416e90..b34eb2369442a9ef43454cf61425e29d31d029cc 100644 (file)
--- a/bindings/solv.i
+++ b/bindings/solv.i
@@ -2137,7 +2137,7 @@ typedef struct {
   static const int SOLVER_FLAG_NO_UPDATEPROVIDE = SOLVER_FLAG_NO_UPDATEPROVIDE;
   static const int SOLVER_FLAG_SPLITPROVIDES = SOLVER_FLAG_SPLITPROVIDES;
   static const int SOLVER_FLAG_IGNORE_RECOMMENDED = SOLVER_FLAG_IGNORE_RECOMMENDED;
-  static const int SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED = SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED;
+  static const int SOLVER_FLAG_ADD_ALREADY_RECOMMENDED = SOLVER_FLAG_ADD_ALREADY_RECOMMENDED;
   static const int SOLVER_FLAG_NO_INFARCHCHECK = SOLVER_FLAG_NO_INFARCHCHECK;
 
   ~Solver() {

diff --git a/examples/p5solv b/examples/p5solv
index f864997e7071ca4b402938856d09ea05b01d06ef..015002ef03b77e971b451ef42fc81188900872a3 100755 (executable)
--- a/examples/p5solv
+++ b/examples/p5solv
@@ -754,7 +754,6 @@ if ($cmd eq 'install' || $cmd eq 'erase' || $cmd eq 'up' || $cmd eq 'dup' || $cm
   my $solver;
   while (1) {
     $solver = $pool->Solver();
-    $solver->set_flag($solv::Solver::SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED, 1);
     $solver->set_flag($solv::Solver::SOLVER_FLAG_SPLITPROVIDES, 1);
     $solver->set_flag($solv::Solver::SOLVER_FLAG_ALLOW_UNINSTALL, 1) if $cmd eq 'erase';
     my @problems = $solver->solve(\@jobs);

diff --git a/examples/pysolv b/examples/pysolv
index 8dea8eaded988708ad4c5feb41da5f2eece8eb87..fa723a089a669cc1a42c2c7c75e206fa92b3f5e2 100755 (executable)
--- a/examples/pysolv
+++ b/examples/pysolv
@@ -848,7 +848,6 @@ if cmd == 'install' or cmd == 'erase' or cmd == 'up' or cmd == 'dup' or cmd == '
     solver = None
     while True:
         solver = pool.Solver()
-        solver.set_flag(Solver.SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED, 1);
         solver.set_flag(Solver.SOLVER_FLAG_SPLITPROVIDES, 1);
         if cmd == 'erase':
             solver.set_flag(Solver.SOLVER_FLAG_ALLOW_UNINSTALL, 1);

diff --git a/examples/rbsolv b/examples/rbsolv
index 52853cf9bbb838fc6cc4b885db87f4a42d3b4307..90be909dd40ef9fde56952e67fb806ff6abd2d2f 100755 (executable)
--- a/examples/rbsolv
+++ b/examples/rbsolv
@@ -756,7 +756,6 @@ if cmd == 'install' || cmd == 'erase' || cmd == 'up' || cmd == 'dup' || cmd == '
   #pool.set_debuglevel(1)
   while true
     solver = pool.Solver
-    solver.set_flag(Solv::Solver::SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED, 1)
     solver.set_flag(Solv::Solver::SOLVER_FLAG_SPLITPROVIDES, 1)
     solver.set_flag(Solv::Solver::SOLVER_FLAG_ALLOW_UNINSTALL, 1) if cmd == 'erase'
     problems = solver.solve(jobs)

diff --git a/examples/solv.c b/examples/solv.c
index 7d69028ec83a14b33a913b4f438309f899fdabf1..df43a802159e9e277e7efb23dc124481a3607005 100644 (file)
--- a/examples/solv.c
+++ b/examples/solv.c
@@ -3020,7 +3020,6 @@ rerunsolver:
       int pcnt, scnt;
 
       solv = solver_create(pool);
-      solver_set_flag(solv, SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED, 1);
       solver_set_flag(solv, SOLVER_FLAG_SPLITPROVIDES, 1);
       if (mainmode == MODE_ERASE)
         solver_set_flag(solv, SOLVER_FLAG_ALLOW_UNINSTALL, 1); /* don't nag */

diff --git a/ext/testcase.c b/ext/testcase.c
index cf7a82c5baf36dc94578d90b05ed852262b6f4ff..fda56f1cceb5ae3c7b2c00f14b8fe1b8ac491084 100644 (file)
--- a/ext/testcase.c
+++ b/ext/testcase.c
@@ -90,7 +90,7 @@ static struct solverflags2str {
   { SOLVER_FLAG_NO_UPDATEPROVIDE,           "noupdateprovide", 0 },
   { SOLVER_FLAG_SPLITPROVIDES,              "splitprovides", 0 },
   { SOLVER_FLAG_IGNORE_RECOMMENDED,         "ignorerecommended", 0 },
-  { SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED, "ignorealreadyrecommended", 0 },
+  { SOLVER_FLAG_ADD_ALREADY_RECOMMENDED,    "addalreadyrecommended", 0 },
   { SOLVER_FLAG_NO_INFARCHCHECK,            "noinfarchcheck", 0 },
   { 0, 0, 0 }
 };

diff --git a/src/solver.c b/src/solver.c
index 3551f58fe24b0ec906cf9552b2e76337ed61c289..667190a79443a8aca2fadf8f4544c6a20d129928 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -1385,8 +1385,8 @@ solver_get_flag(Solver *solv, int flag)
     return solv->dosplitprovides;
   case SOLVER_FLAG_IGNORE_RECOMMENDED:
     return solv->dontinstallrecommended;
-  case SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED:
-    return solv->ignorealreadyrecommended;
+  case SOLVER_FLAG_ADD_ALREADY_RECOMMENDED:
+    return solv->addalreadyrecommended;
   case SOLVER_FLAG_NO_INFARCHCHECK:
     return solv->noinfarchcheck;
   default:
@@ -1422,8 +1422,8 @@ solver_set_flag(Solver *solv, int flag, int value)
   case SOLVER_FLAG_IGNORE_RECOMMENDED:
     solv->dontinstallrecommended = value;
     break;
-  case SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED:
-    solv->ignorealreadyrecommended = value;
+  case SOLVER_FLAG_ADD_ALREADY_RECOMMENDED:
+    solv->addalreadyrecommended = value;
     break;
   case SOLVER_FLAG_NO_INFARCHCHECK:
     solv->noinfarchcheck = value;
@@ -1884,7 +1884,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                  /* installed, check for recommends */
                  Id *recp, rec, pp, p;
                  s = pool->solvables + i;
-                 if (solv->ignorealreadyrecommended && s->repo == solv->installed)
+                 if (!solv->addalreadyrecommended && s->repo == solv->installed)
                    continue;
                  /* XXX need to special case AND ? */
                  if (s->recommends)
@@ -1960,7 +1960,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
            }
 
           /* filter out all already supplemented packages if requested */
-          if (solv->ignorealreadyrecommended && dqs.count)
+          if (!solv->addalreadyrecommended && dqs.count)
            {
              /* turn off all new packages */
              for (i = 0; i < solv->decisionq.count; i++)
@@ -2082,7 +2082,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                  if (p < 0)
                    continue;
                  s = pool->solvables + p;
-                 if (!s->repo || (solv->ignorealreadyrecommended && s->repo == solv->installed))
+                 if (!s->repo || (!solv->addalreadyrecommended && s->repo == solv->installed))
                    continue;
                  if (!s->recommends)
                    continue;
@@ -2484,7 +2484,7 @@ solver_solve(Solver *solv, Queue *job)
   POOL_DEBUG(SOLV_DEBUG_STATS, "allowuninstall=%d, allowdowngrade=%d, allowarchchange=%d, allowvendorchange=%d\n", solv->allowuninstall, solv->allowdowngrade, solv->allowarchchange, solv->allowvendorchange);
   POOL_DEBUG(SOLV_DEBUG_STATS, "promoteepoch=%d, forbidselfconflicts=%d\n", pool->promoteepoch, pool->forbidselfconflicts);
   POOL_DEBUG(SOLV_DEBUG_STATS, "obsoleteusesprovides=%d, implicitobsoleteusesprovides=%d, obsoleteusescolors=%d\n", pool->obsoleteusesprovides, pool->implicitobsoleteusesprovides, pool->obsoleteusescolors);
-  POOL_DEBUG(SOLV_DEBUG_STATS, "dontinstallrecommended=%d, ignorealreadyrecommended=%d\n", solv->dontinstallrecommended, solv->ignorealreadyrecommended);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "dontinstallrecommended=%d, addalreadyrecommended=%d\n", solv->dontinstallrecommended, solv->addalreadyrecommended);
 
   /* create whatprovides if not already there */
   if (!pool->whatprovides)
@@ -3445,7 +3445,7 @@ solver_describe_weakdep_decision(Solver *solv, Id p, Queue *whyq)
       s = pool->solvables + i;
       if (!s->recommends)
        continue;
-      if (solv->ignorealreadyrecommended && s->repo == solv->installed)
+      if (!solv->addalreadyrecommended && s->repo == solv->installed)
        continue;
       recp = s->repo->idarraydata + s->recommends;
       while ((rec = *recp++) != 0)
@@ -3490,7 +3490,7 @@ solver_describe_weakdep_decision(Solver *solv, Id p, Queue *whyq)
            /* let's see if this is an easy supp */
            FOR_PROVIDES(p2, pp2, sup)
              {
-               if (solv->ignorealreadyrecommended && solv->installed)
+               if (!solv->addalreadyrecommended && solv->installed)
                  {
                    if (pool->solvables[p2].repo == solv->installed)
                      continue;

diff --git a/src/solver.h b/src/solver.h
index e7d24b2514fd4ac388f165c9ed60353f65f24820..7787c4903346303bd745ef45a929e19449c75a19 100644 (file)
--- a/src/solver.h
+++ b/src/solver.h
@@ -189,7 +189,7 @@ 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 ignorealreadyrecommended;                /* true: ignore recommended packages that were already recommended by the installed packages */
+  int addalreadyrecommended;           /* true: also install recommended packages that were already recommended by the installed packages */
   int dontshowinstalledrecommended;    /* true: do not show recommended packages that are already installed */
   
   int noinfarchcheck;                  /* true: do not forbid inferior architectures */
@@ -277,7 +277,7 @@ typedef struct _Solver Solver;
 #define SOLVER_FLAG_NO_UPDATEPROVIDE           5
 #define SOLVER_FLAG_SPLITPROVIDES              6
 #define SOLVER_FLAG_IGNORE_RECOMMENDED         7
-#define SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED 8
+#define SOLVER_FLAG_ADD_ALREADY_RECOMMENDED    8
 #define SOLVER_FLAG_NO_INFARCHCHECK            9
 
 extern Solver *solver_create(Pool *pool);