- some more cleanup

diff --git a/src/rules.c b/src/rules.c
index ca5f758fe1f4a529e442c20960ac90c862ab23e6..331b34465793559e00fe04cc3a422bcc4c8285a2 100644 (file)
--- a/src/rules.c
+++ b/src/rules.c
@@ -1805,7 +1805,7 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp)
 }
 
 void
-addchoicerules(Solver *solv)
+solver_addchoicerules(Solver *solv)
 {
   Pool *pool = solv->pool;
   Map m, mneg;

diff --git a/src/rules.h b/src/rules.h
index b70b6403a70006aff457b63f715c2ec70f511296..0158223ea4c6930807fc90065fa452634d287d0d 100644 (file)
--- a/src/rules.h
+++ b/src/rules.h
@@ -123,6 +123,7 @@ int solver_allruleinfos(struct _Solver *solv, Id rid, Queue *rq);
 SolverRuleinfo solver_ruleinfo(struct _Solver *solv, Id rid, Id *fromp, Id *top, Id *depp);
 
 /* misc functions */
+void solver_addchoicerules(struct _Solver *solv);
 void solver_disablechoicerules(struct _Solver *solv, Rule *r);
 
 #ifdef __cplusplus

diff --git a/src/solver.c b/src/solver.c
index fc058f0a8c02ab7ffb63a6f662285d7a84a974b0..1ffe5bf8a9d1b369999726c8db4395d8b6b9d951 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -2594,7 +2594,10 @@ solver_solve(Solver *solv, Queue *job)
          break;
        case SOLVER_DISTUPGRADE:
          if (select == SOLVER_SOLVABLE_ALL)
-           solv->dupmap_all = 1;
+           {
+             solv->dupmap_all = 1;
+             solv->updatemap_all = 1;
+           }
          if (!solv->dupmap_all)
            hasdupjob = 1;
          break;
@@ -2905,10 +2908,7 @@ solver_solve(Solver *solv, Queue *job)
     solv->duprules = solv->duprules_end = solv->nrules;
 
   if (1)
-    {
-      extern void addchoicerules(Solver *solv);
-      addchoicerules(solv);
-    }
+    solver_addchoicerules(solv);
   else
     solv->choicerules = solv->choicerules_end = solv->nrules;
 

diff --git a/src/solverdebug.c b/src/solverdebug.c
index 6884111851da9e638b089b899c4c25680a6aca52..e5bf519ebf7d928f030db5c88e16906bc64d45fd 100644 (file)
--- a/src/solverdebug.c
+++ b/src/solverdebug.c
@@ -705,11 +705,7 @@ solver_printsolution(Solver *solv, Id problem, Id solution)
          /* policy, replace p with rp */
          s = pool->solvables + p;
          sd = rp ? pool->solvables + rp : 0;
-         if (s == sd && solv->dupmap_all)
-           {
-             POOL_DEBUG(SAT_DEBUG_RESULT, "  - keep obsolete %s\n", solvable2str(pool, s));
-           }
-         else if (sd)
+         if (sd)
            {
              int gotone = 0;
              if (!solv->allowdowngrade && evrcmp(pool, s->evr, sd->evr, EVRCMP_MATCH_RELEASE) > 0)
@@ -737,7 +733,6 @@ solver_printsolution(Solver *solv, Id problem, Id solution)
            {
              POOL_DEBUG(SAT_DEBUG_RESULT, "  - allow deinstallation of %s\n", solvable2str(pool, s));
            }
-
        }
     }
 }