Merge pull request #12 from zde/master

add SOLVER_FLAG_KEEP_EXPLICIT_OBSOLETES

diff --git a/src/rules.c b/src/rules.c
index 00d5c33..bf98b18 100644 (file)
--- a/src/rules.c
+++ b/src/rules.c
@@ -665,7 +665,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
        {
          int noobs = solv->noobsoletes.size && MAPTST(&solv->noobsoletes, n);
          int isinstalled = (installed && s->repo == installed);
-         if (s->obsoletes && !noobs)
+         if (s->obsoletes && (!noobs || solv->keepexplicitobsoletes))
            {
              obsp = s->repo->idarraydata + s->obsoletes;
              /* foreach obsoletes */

diff --git a/src/solver.c b/src/solver.c
index 23a8d71..ef116c2 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -1473,6 +1473,8 @@ solver_get_flag(Solver *solv, int flag)
     return solv->addalreadyrecommended;
   case SOLVER_FLAG_NO_INFARCHCHECK:
     return solv->noinfarchcheck;
+  case SOLVER_FLAG_KEEP_EXPLICIT_OBSOLETES:
+    return solv->keepexplicitobsoletes;
   default:
     break;
   }
@@ -1515,6 +1517,9 @@ solver_set_flag(Solver *solv, int flag, int value)
   case SOLVER_FLAG_NO_INFARCHCHECK:
     solv->noinfarchcheck = value;
     break;
+  case SOLVER_FLAG_KEEP_EXPLICIT_OBSOLETES:
+    solv->keepexplicitobsoletes = value;
+    break;
   default:
     break;
   }
@@ -2566,7 +2571,7 @@ solver_solve(Solver *solv, Queue *job)
 
   /* log solver options */
   POOL_DEBUG(SOLV_DEBUG_STATS, "solver started\n");
-  POOL_DEBUG(SOLV_DEBUG_STATS, "dosplitprovides=%d, noupdateprovide=%d noinfarchcheck=%d\n", solv->dosplitprovides, solv->noupdateprovide, solv->noinfarchcheck);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "dosplitprovides=%d, noupdateprovide=%d, noinfarchcheck=%d\n", solv->dosplitprovides, solv->noupdateprovide, solv->noinfarchcheck);
   POOL_DEBUG(SOLV_DEBUG_STATS, "allowuninstall=%d, allowdowngrade=%d, allownamechange=%d, allowarchchange=%d, allowvendorchange=%d\n", solv->allowuninstall, solv->allowdowngrade, solv->allownamechange, 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);

diff --git a/src/solver.h b/src/solver.h
index 84ffb8e..ddab97b 100644 (file)
--- a/src/solver.h
+++ b/src/solver.h
@@ -194,6 +194,7 @@ struct _Solver {
   int dontshowinstalledrecommended;    /* true: do not show recommended packages that are already installed */
   
   int noinfarchcheck;                  /* true: do not forbid inferior architectures */
+  int keepexplicitobsoletes;           /* true: honor obsoletes during multiinstall */
 
     
   Map dupmap;                          /* dup these packages*/
@@ -283,6 +284,7 @@ typedef struct _Solver Solver;
 #define SOLVER_FLAG_ADD_ALREADY_RECOMMENDED    8
 #define SOLVER_FLAG_NO_INFARCHCHECK            9
 #define SOLVER_FLAG_ALLOW_NAMECHANGE           10
+#define SOLVER_FLAG_KEEP_EXPLICIT_OBSOLETES    11
 
 extern Solver *solver_create(Pool *pool);
 extern void solver_free(Solver *solv);

diff --git a/src/solverdebug.c b/src/solverdebug.c
index 408fc6e..3c4af96 100644 (file)
--- a/src/solverdebug.c
+++ b/src/solverdebug.c
@@ -589,7 +589,7 @@ solver_printproblemruleinfo(Solver *solv, Id probr)
       POOL_DEBUG(SOLV_DEBUG_RESULT, "installed package %s obsoletes %s provided by %s\n", pool_solvid2str(pool, source), pool_dep2str(pool, dep), pool_solvid2str(pool, target));
       return;
     case SOLVER_RULE_RPM_IMPLICIT_OBSOLETES:
-      POOL_DEBUG(SOLV_DEBUG_RESULT, "package %s implicitely obsoletes %s provided by %s\n", pool_solvid2str(pool, source), pool_dep2str(pool, dep), pool_solvid2str(pool, target));
+      POOL_DEBUG(SOLV_DEBUG_RESULT, "package %s implicitly obsoletes %s provided by %s\n", pool_solvid2str(pool, source), pool_dep2str(pool, dep), pool_solvid2str(pool, target));
       return;
     case SOLVER_RULE_RPM_PACKAGE_REQUIRES:
       POOL_DEBUG(SOLV_DEBUG_RESULT, "package %s requires %s, but none of the providers can be installed\n", pool_solvid2str(pool, source), pool_dep2str(pool, dep));
@@ -966,7 +966,7 @@ solver_problemruleinfo2str(Solver *solv, SolverRuleinfo type, Id source, Id targ
       return pool_tmpappend(pool, s, " provided by ", pool_solvid2str(pool, target));
     case SOLVER_RULE_RPM_IMPLICIT_OBSOLETES:
       s = pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), 0);
-      s = pool_tmpappend(pool, s, " implicitely obsoletes ", pool_dep2str(pool, dep));
+      s = pool_tmpappend(pool, s, " implicitly obsoletes ", pool_dep2str(pool, dep));
       return pool_tmpappend(pool, s, " provided by ", pool_solvid2str(pool, target));
     case SOLVER_RULE_RPM_PACKAGE_REQUIRES:
       s = pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), " requires ");