SOLVER_FLAG_KEEP_EXPLICIT_OBSOLETES

true: process explicit obsoletes in multiinstall.
Defaults to 0.  Needed for compatibility with 'yum'.

diff --git a/src/rules.c b/src/rules.c
index 00d5c332303b9576f46d02b5f4d55d4f8f809e58..bf98b1803b5459bfb0aaa5c29f3009f511859f6e 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 f19d7dac8f21b66bf0a3ba053906de10708f5af4..ef116c28b3df3b6bf83aa36d2e4bfafffc4716d4 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;
   }

diff --git a/src/solver.h b/src/solver.h
index 84ffb8e220bfa1e7799c0c25cd56ad57fc598cc1..ddab97bd0b1bcc3ce1bc2fabbf8926cb347b6fc2 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);