make FOR_RULELITERALS safe against whatprovides realloc
[platform/upstream/libsolv.git] / src / rules.c
index 2ce386a..d16c423 100644 (file)
@@ -18,6 +18,7 @@
 #include <assert.h>
 
 #include "solver.h"
+#include "solver_private.h"
 #include "bitmap.h"
 #include "pool.h"
 #include "poolarch.h"
 #define RULES_BLOCK 63
 
 static void addrpmruleinfo(Solver *solv, Id p, Id d, int type, Id dep);
-static void solver_createcleandepsmap(Solver *solv);
+static void solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded);
 
 /*-------------------------------------------------------------------
  * Check if dependency is possible
  * 
  * mirrors solver_dep_fulfilled but uses map m instead of the decisionmap
+ * used in solver_addrpmrulesforweak and solver_createcleandepsmap
  */
 
 static inline int
@@ -46,16 +48,19 @@ dep_possible(Solver *solv, Id dep, Map *m)
   if (ISRELDEP(dep))
     {
       Reldep *rd = GETRELDEP(pool, dep);
-      if (rd->flags == REL_AND)
+      if (rd->flags >= 8)
        {
-         if (!dep_possible(solv, rd->name, m))
-           return 0;
-         return dep_possible(solv, rd->evr, m);
+         if (rd->flags == REL_AND)
+           {
+             if (!dep_possible(solv, rd->name, m))
+               return 0;
+             return dep_possible(solv, rd->evr, m);
+           }
+         if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
+           return solver_splitprovides(solv, rd->evr);
+         if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
+           return solver_dep_installed(solv, rd->evr);
        }
-      if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
-       return solver_splitprovides(solv, rd->evr);
-      if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
-       return solver_dep_installed(solv, rd->evr);
     }
   FOR_PROVIDES(p, pp, dep)
     {
@@ -117,7 +122,7 @@ unifyrules_sortcmp(const void *ap, const void *bp, void *dp)
 }
 
 int
-solver_samerule(Solver *solv, Rule *r1, Rule *r2)
+solver_rulecmp(Solver *solv, Rule *r1, Rule *r2)
 {
   return unifyrules_sortcmp(r1, r2, solv->pool);
 }
@@ -136,13 +141,11 @@ solver_unifyrules(Solver *solv)
   int i, j;
   Rule *ir, *jr;
 
-  if (solv->nrules <= 1)              /* nothing to unify */
+  if (solv->nrules <= 2)              /* nothing to unify */
     return;
 
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- unifyrules -----\n");
-
   /* sort rules first */
-  sat_sort(solv->rules + 1, solv->nrules - 1, sizeof(Rule), unifyrules_sortcmp, solv->pool);
+  solv_sort(solv->rules + 1, solv->nrules - 1, sizeof(Rule), unifyrules_sortcmp, solv->pool);
 
   /* prune rules
    * i = unpruned
@@ -159,16 +162,16 @@ solver_unifyrules(Solver *solv)
     }
 
   /* reduced count from nrules to j rules */
-  POOL_DEBUG(SAT_DEBUG_STATS, "pruned rules from %d to %d\n", solv->nrules, j);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "pruned rules from %d to %d\n", solv->nrules, j);
 
   /* adapt rule buffer */
   solv->nrules = j;
-  solv->rules = sat_extend_resize(solv->rules, solv->nrules, sizeof(Rule), RULES_BLOCK);
+  solv->rules = solv_extend_resize(solv->rules, solv->nrules, sizeof(Rule), RULES_BLOCK);
 
   /*
    * debug: log rule statistics
    */
-  IF_POOLDEBUG (SAT_DEBUG_STATS)
+  IF_POOLDEBUG (SOLV_DEBUG_STATS)
     {
       int binr = 0;
       int lits = 0;
@@ -187,10 +190,9 @@ solver_unifyrules(Solver *solv)
                lits++;
            }
        }
-      POOL_DEBUG(SAT_DEBUG_STATS, "  binary: %d\n", binr);
-      POOL_DEBUG(SAT_DEBUG_STATS, "  normal: %d, %d literals\n", solv->nrules - 1 - binr, lits);
+      POOL_DEBUG(SOLV_DEBUG_STATS, "  binary: %d\n", binr);
+      POOL_DEBUG(SOLV_DEBUG_STATS, "  normal: %d, %d literals\n", solv->nrules - 1 - binr, lits);
     }
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- unifyrules end -----\n");
 }
 
 #if 0
@@ -247,7 +249,7 @@ hashrule(Solver *solv, Id p, Id d, int n)
  *
  *   resulting watches:
  *   ------------------
- *   Direct assertion (no watch needed)( if d <0 ) --> d = 0, w1 = p, w2 = 0
+ *   Direct assertion (no watch needed) --> d = 0, w1 = p, w2 = 0
  *   Binary rule: p = first literal, d = 0, w2 = second literal, w1 = p
  *   every other : w1 = p, w2 = whatprovidesdata[d];
  *   Disabled rule: w1 = 0
@@ -272,11 +274,10 @@ solver_addrule(Solver *solv, Id p, Id d)
    * multiple times, so we prune those duplicates right away to make
    * the work for unifyrules a bit easier */
 
-  if (solv->nrules                      /* we already have rules */
-      && !solv->rpmrules_end)           /* but are not done with rpm rules */
+  if (!solv->rpmrules_end)             /* we add rpm rules */
     {
-      r = solv->rules + solv->nrules - 1;   /* get the last added rule */
-      if (r->p == p && r->d == d && d != 0)   /* identical and not user requested */
+      r = solv->rules + solv->nrules - 1;      /* get the last added rule */
+      if (r->p == p && r->d == d && (d != 0 || !r->w2))
        return r;
     }
 
@@ -297,8 +298,8 @@ solver_addrule(Solver *solv, Id p, Id d)
        if (*dp == -p)
          return 0;                     /* rule is self-fulfilling */
        
-      if (n == 1)   /* have single provider */
-       d = dp[-1];                     /* take single literal */
+      if (n == 1)                      /* convert to binary rule */
+       d = dp[-1];
     }
 
   if (n == 1 && p > d && !solv->rpmrules_end)
@@ -336,7 +337,7 @@ solver_addrule(Solver *solv, Id p, Id d)
    */
 
   /* extend rule buffer */
-  solv->rules = sat_extend(solv->rules, solv->nrules, 1, sizeof(Rule), RULES_BLOCK);
+  solv->rules = solv_extend(solv->rules, solv->nrules, 1, sizeof(Rule), RULES_BLOCK);
   r = solv->rules + solv->nrules++;    /* point to rule space */
 
     /*
@@ -367,10 +368,10 @@ solver_addrule(Solver *solv, Id p, Id d)
   r->n1 = 0;
   r->n2 = 0;
 
-  IF_POOLDEBUG (SAT_DEBUG_RULE_CREATION)
+  IF_POOLDEBUG (SOLV_DEBUG_RULE_CREATION)
     {
-      POOL_DEBUG(SAT_DEBUG_RULE_CREATION, "  Add rule: ");
-      solver_printrule(solv, SAT_DEBUG_RULE_CREATION, r);
+      POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "  Add rule: ");
+      solver_printrule(solv, SOLV_DEBUG_RULE_CREATION, r);
     }
 
   return r;
@@ -476,8 +477,6 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
   Id *dp;              /* ptr to 'whatprovides' */
   Id n;                        /* Id for current solvable 's' */
 
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- addrpmrulesforsolvable -----\n");
-
   queue_init_buffer(&workq, workqbuf, sizeof(workqbuf)/sizeof(*workqbuf));
   queue_push(&workq, s - pool->solvables);     /* push solvable Id to work queue */
 
@@ -513,12 +512,12 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
          && s->arch != ARCH_NOSRC
          && !pool_installable(pool, s))
        {
-         POOL_DEBUG(SAT_DEBUG_RULE_CREATION, "package %s [%d] is not installable\n", solvable2str(pool, s), (Id)(s - pool->solvables));
+         POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable\n", pool_solvable2str(pool, s), (Id)(s - pool->solvables));
          addrpmrule(solv, -n, 0, SOLVER_RULE_RPM_NOT_INSTALLABLE, 0);
        }
 
       /* yet another SUSE hack, sigh */
-      if (pool->nscallback && !strncmp("product:", id2str(pool, s->name), 8))
+      if (pool->nscallback && !strncmp("product:", pool_id2str(pool, s->name), 8))
         {
           Id buddy = pool->nscallback(pool, pool->nscallbackdata, NAMESPACE_PRODUCTBUDDY, n);
           if (buddy > 0 && buddy != SYSTEMSOLVABLE && buddy != n && buddy < pool->nsolvables)
@@ -564,7 +563,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
                  /* didn't find an installed provider: previously broken dependency */
                  if (!p)
                    {
-                     POOL_DEBUG(SAT_DEBUG_RULE_CREATION, "ignoring broken requires %s of installed package %s\n", dep2str(pool, req), solvable2str(pool, s));
+                     POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "ignoring broken requires %s of installed package %s\n", pool_dep2str(pool, req), pool_solvable2str(pool, s));
                      continue;
                    }
                }
@@ -572,16 +571,16 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
              if (!*dp)
                {
                  /* nothing provides req! */
-                 POOL_DEBUG(SAT_DEBUG_RULE_CREATION, "package %s [%d] is not installable (%s)\n", solvable2str(pool, s), (Id)(s - pool->solvables), dep2str(pool, req));
+                 POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable (%s)\n", pool_solvable2str(pool, s), (Id)(s - pool->solvables), pool_dep2str(pool, req));
                  addrpmrule(solv, -n, 0, SOLVER_RULE_RPM_NOTHING_PROVIDES_DEP, req);
                  continue;
                }
 
-             IF_POOLDEBUG (SAT_DEBUG_RULE_CREATION)
+             IF_POOLDEBUG (SOLV_DEBUG_RULE_CREATION)
                {
-                 POOL_DEBUG(SAT_DEBUG_RULE_CREATION,"  %s requires %s\n", solvable2str(pool, s), dep2str(pool, req));
+                 POOL_DEBUG(SOLV_DEBUG_RULE_CREATION,"  %s requires %s\n", pool_solvable2str(pool, s), pool_dep2str(pool, req));
                  for (i = 0; dp[i]; i++)
-                   POOL_DEBUG(SAT_DEBUG_RULE_CREATION, "   provided by %s\n", solvid2str(pool, dp[i]));
+                   POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "   provided by %s\n", pool_solvid2str(pool, dp[i]));
                }
 
              /* add 'requires' dependency */
@@ -621,7 +620,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
           * XXX: we should really handle this different, looking
           * at the name is a bad hack
           */
-         if (!strncmp("patch:", id2str(pool, s->name), 6))
+         if (!strncmp("patch:", pool_id2str(pool, s->name), 6))
            ispatch = 1;
          conp = s->repo->idarraydata + s->conflicts;
          /* foreach conflicts of 's' */
@@ -636,7 +635,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
                  if (dontfix && pool->solvables[p].repo == installed)
                    continue;
                  /* p == n: self conflict */
-                 if (p == n && !pool->allowselfconflicts)
+                 if (p == n && pool->forbidselfconflicts)
                    {
                      if (ISRELDEP(con))
                        {
@@ -666,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 */
@@ -747,15 +746,14 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
        }
     }
   queue_free(&workq);
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- addrpmrulesforsolvable end -----\n");
 }
 
 
 /*-------------------------------------------------------------------
  * 
- * Add package rules for weak rules
+ * Add rules for packages possibly selected in by weak dependencies
  *
- * m: visited solvables
+ * m: already added solvables
  */
 
 void
@@ -766,25 +764,26 @@ solver_addrpmrulesforweak(Solver *solv, Map *m)
   Id sup, *supp;
   int i, n;
 
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- addrpmrulesforweak -----\n");
-    /* foreach solvable in pool */
+  /* foreach solvable in pool */
   for (i = n = 1; n < pool->nsolvables; i++, n++)
     {
       if (i == pool->nsolvables)               /* wrap i */
        i = 1;
-      if (MAPTST(m, i))                                /* been there */
+      if (MAPTST(m, i))                                /* already added that one */
        continue;
 
       s = pool->solvables + i;
-      if (!pool_installable(pool, s))          /* only look at installable ones */
+      if (!s->repo)
        continue;
+      if (s->repo != pool->installed && !pool_installable(pool, s))
+       continue;       /* only look at installable ones */
 
       sup = 0;
       if (s->supplements)
        {
          /* find possible supplements */
          supp = s->repo->idarraydata + s->supplements;
-         while ((sup = *supp++) != ID_NULL)
+         while ((sup = *supp++) != 0)
            if (dep_possible(solv, sup, m))
              break;
        }
@@ -793,7 +792,7 @@ solver_addrpmrulesforweak(Solver *solv, Map *m)
       if (!sup && s->enhances)
        {
          supp = s->repo->idarraydata + s->enhances;
-         while ((sup = *supp++) != ID_NULL)
+         while ((sup = *supp++) != 0)
            if (dep_possible(solv, sup, m))
              break;
        }
@@ -801,9 +800,8 @@ solver_addrpmrulesforweak(Solver *solv, Map *m)
       if (!sup)
        continue;
       solver_addrpmrulesforsolvable(solv, s, m);
-      n = 0;                   /* check all solvables again */
+      n = 0;                   /* check all solvables again because we added solvables to m */
     }
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- addrpmrulesforweak end -----\n");
 }
 
 
@@ -825,8 +823,6 @@ solver_addrpmrulesforupdaters(Solver *solv, Solvable *s, Map *m, int allow_all)
   Queue qs;
   Id qsbuf[64];
 
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- addrpmrulesforupdaters -----\n");
-
   queue_init_buffer(&qs, qsbuf, sizeof(qsbuf)/sizeof(*qsbuf));
     /* find update candidates for 's' */
   policy_findupdatepackages(solv, s, &qs, allow_all);
@@ -838,8 +834,6 @@ solver_addrpmrulesforupdaters(Solver *solv, Solvable *s, Map *m, int allow_all)
     if (!MAPTST(m, qs.elements[i]))
       solver_addrpmrulesforsolvable(solv, pool->solvables + qs.elements[i], m);
   queue_free(&qs);
-
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- addrpmrulesforupdaters -----\n");
 }
 
 
@@ -857,7 +851,7 @@ finddistupgradepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all)
   Pool *pool = solv->pool;
   int i;
 
-  policy_findupdatepackages(solv, s, qs, allow_all);
+  policy_findupdatepackages(solv, s, qs, allow_all ? allow_all : 2);
   if (!qs->count)
     {
       if (allow_all)
@@ -923,7 +917,6 @@ solver_addupdaterule(Solver *solv, Solvable *s, int allow_all)
   Queue qs;
   Id qsbuf[64];
 
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "-----  addupdaterule -----\n");
   queue_init_buffer(&qs, qsbuf, sizeof(qsbuf)/sizeof(*qsbuf));
   p = s - pool->solvables;
   /* find update candidates for 's' */
@@ -957,7 +950,7 @@ solver_addupdaterule(Solver *solv, Solvable *s, int allow_all)
               (solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, s - pool->solvables - solv->installed->start))))
            {
              if (!solv->multiversionupdaters)
-               solv->multiversionupdaters = sat_calloc(solv->installed->end - solv->installed->start, sizeof(Id));
+               solv->multiversionupdaters = solv_calloc(solv->installed->end - solv->installed->start, sizeof(Id));
              solv->multiversionupdaters[s - pool->solvables - solv->installed->start] = d;
            }
          if (j == 0 && p == -SYSTEMSOLVABLE && solv->dupmap_all)
@@ -967,13 +960,19 @@ solver_addupdaterule(Solver *solv, Solvable *s, int allow_all)
            }
          qs.count = j;
        }
+      else if (p != -SYSTEMSOLVABLE)
+       {
+         /* could fallthrough, but then we would do pool_queuetowhatprovides twice */
+         queue_free(&qs);
+         solver_addrule(solv, p, d);   /* allow update of s */
+         return;
+       }
     }
   if (qs.count && p == -SYSTEMSOLVABLE)
     p = queue_shift(&qs);
   d = qs.count ? pool_queuetowhatprovides(pool, &qs) : 0;
   queue_free(&qs);
   solver_addrule(solv, p, d);  /* allow update of s */
-  POOL_DEBUG(SAT_DEBUG_SCHUBI, "-----  addupdaterule end -----\n");
 }
 
 static inline void 
@@ -988,6 +987,14 @@ disableupdaterule(Solver *solv, Id p)
   r = solv->rules + solv->featurerules + (p - solv->installed->start);
   if (r->p && r->d >= 0)
     solver_disablerule(solv, r);
+  if (solv->bestrules_pkg)
+    {
+      int i, ni;
+      ni = solv->bestrules_end - solv->bestrules;
+      for (i = 0; i < ni; i++)
+       if (solv->bestrules_pkg[i] == p)
+         solver_disablerule(solv, solv->rules + solv->bestrules + i);
+    }
 }
 
 static inline void 
@@ -1000,26 +1007,37 @@ reenableupdaterule(Solver *solv, Id p)
   r = solv->rules + solv->updaterules + (p - solv->installed->start);
   if (r->p)
     {    
-      if (r->d >= 0)
-       return;
-      solver_enablerule(solv, r);
-      IF_POOLDEBUG (SAT_DEBUG_SOLUTIONS)
+      if (r->d < 0)
        {
-         POOL_DEBUG(SAT_DEBUG_SOLUTIONS, "@@@ re-enabling ");
-         solver_printruleclass(solv, SAT_DEBUG_SOLUTIONS, r);
+         solver_enablerule(solv, r);
+         IF_POOLDEBUG (SOLV_DEBUG_SOLUTIONS)
+           {
+             POOL_DEBUG(SOLV_DEBUG_SOLUTIONS, "@@@ re-enabling ");
+             solver_printruleclass(solv, SOLV_DEBUG_SOLUTIONS, r);
+           }
        }
-      return;
     }
-  r = solv->rules + solv->featurerules + (p - solv->installed->start);
-  if (r->p && r->d < 0)
+  else
     {
-      solver_enablerule(solv, r);
-      IF_POOLDEBUG (SAT_DEBUG_SOLUTIONS)
+      r = solv->rules + solv->featurerules + (p - solv->installed->start);
+      if (r->p && r->d < 0)
        {
-         POOL_DEBUG(SAT_DEBUG_SOLUTIONS, "@@@ re-enabling ");
-         solver_printruleclass(solv, SAT_DEBUG_SOLUTIONS, r);
+         solver_enablerule(solv, r);
+         IF_POOLDEBUG (SOLV_DEBUG_SOLUTIONS)
+           {
+             POOL_DEBUG(SOLV_DEBUG_SOLUTIONS, "@@@ re-enabling ");
+             solver_printruleclass(solv, SOLV_DEBUG_SOLUTIONS, r);
+           }
        }
     }
+  if (solv->bestrules_pkg)
+    {
+      int i, ni;
+      ni = solv->bestrules_end - solv->bestrules;
+      for (i = 0; i < ni; i++)
+       if (solv->bestrules_pkg[i] == p)
+         solver_enablerule(solv, solv->rules + solv->bestrules + i);
+    }
 }
 
 
@@ -1144,10 +1162,10 @@ reenableinfarchrule(Solver *solv, Id name)
       if (r->p < 0 && r->d < 0 && pool->solvables[-r->p].name == name)
         {
           solver_enablerule(solv, r);
-          IF_POOLDEBUG (SAT_DEBUG_SOLUTIONS)
+          IF_POOLDEBUG (SOLV_DEBUG_SOLUTIONS)
             {
-              POOL_DEBUG(SAT_DEBUG_SOLUTIONS, "@@@ re-enabling ");
-              solver_printruleclass(solv, SAT_DEBUG_SOLUTIONS, r);
+              POOL_DEBUG(SOLV_DEBUG_SOLUTIONS, "@@@ re-enabling ");
+              solver_printruleclass(solv, SOLV_DEBUG_SOLUTIONS, r);
             }
         }
     }
@@ -1169,7 +1187,8 @@ solver_createdupmaps(Solver *solv)
   Queue *job = &solv->job;
   Pool *pool = solv->pool;
   Repo *repo;
-  Id how, what, p, pi, pp, obs, *obsp;
+  Repo *installed = solv->installed;
+  Id select, how, what, p, pi, pp, pip, obs, *obsp;
   Solvable *s, *ps;
   int i;
 
@@ -1178,39 +1197,131 @@ solver_createdupmaps(Solver *solv)
   for (i = 0; i < job->count; i += 2)
     {
       how = job->elements[i];
+      select = job->elements[i] & SOLVER_SELECTMASK;
       what = job->elements[i + 1];
       switch (how & SOLVER_JOBMASK)
        {
        case SOLVER_DISTUPGRADE:
-         if ((how & SOLVER_SELECTMASK) != SOLVER_SOLVABLE_REPO)
-           break;
+         if (select != SOLVER_SOLVABLE_REPO)
+           {
+             int haveinstalled;
+             p = 0;
+             if (installed)
+               {
+                 FOR_JOB_SELECT(p, pp, select, what)
+                   if (pool->solvables[p].repo == installed)
+                     break;
+               }
+             haveinstalled = p != 0;
+             FOR_JOB_SELECT(p, pp, select, what)
+               {
+                 Solvable *s = pool->solvables + p;
+                 if (!s->repo)
+                   continue;
+                 if (haveinstalled && s->repo != installed)
+                   continue;
+                 if (s->repo != installed && !pool_installable(pool, s))
+                   continue;
+                 MAPSET(&solv->dupinvolvedmap, p);
+                 if (!haveinstalled)
+                   MAPSET(&solv->dupmap, p);
+                 FOR_PROVIDES(pi, pip, s->name)
+                   {
+                     ps = pool->solvables + pi;
+                     if (ps->name != s->name)
+                       continue;
+                     MAPSET(&solv->dupinvolvedmap, pi);
+                     if (ps->repo == installed && (how & SOLVER_FORCEBEST) != 0)
+                       {
+                         if (!solv->bestupdatemap.size)
+                           map_grow(&solv->bestupdatemap, installed->end - installed->start);
+                         MAPSET(&solv->bestupdatemap, pi - installed->start);
+                       }
+                     if (haveinstalled && ps->repo != installed)
+                       MAPSET(&solv->dupmap, pi);
+                   }
+                 if (haveinstalled)
+                   {
+                     if (solv->obsoletes && solv->obsoletes[p - installed->start])
+                       {
+                         Id *opp;
+                         for (opp = solv->obsoletes_data + solv->obsoletes[p - installed->start]; (pi = *opp++) != 0;)
+                           {
+                             ps = pool->solvables + pi;
+                             if (ps->repo == installed)
+                               continue;
+                             MAPSET(&solv->dupinvolvedmap, pi);
+                             MAPSET(&solv->dupmap, pi);
+                           }
+                       }
+                   }
+                 else if (s->obsoletes)
+                   {
+                     /* XXX: check obsoletes/provides combination */
+                     obsp = s->repo->idarraydata + s->obsoletes;
+                     while ((obs = *obsp++) != 0)
+                       {
+                         FOR_PROVIDES(pi, pp, obs)
+                           {
+                             Solvable *ps = pool->solvables + pi;
+                             if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs))
+                               continue;
+                             if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps))
+                               continue;
+                             MAPSET(&solv->dupinvolvedmap, pi);
+                             if (ps->repo == installed && (how & SOLVER_FORCEBEST) != 0)
+                               {
+                                 if (!solv->bestupdatemap.size)
+                                   map_grow(&solv->bestupdatemap, installed->end - installed->start);
+                                 MAPSET(&solv->bestupdatemap, pi - installed->start);
+                               }
+                           }
+                       }
+                   }
+               }
+             break;
+           }
          if (what <= 0 || what > pool->nrepos)
            break;
          repo = pool_id2repo(pool, what);
          FOR_REPO_SOLVABLES(repo, p, s)
            {
+             if (repo != installed && !pool_installable(pool, s))
+               continue;
              MAPSET(&solv->dupmap, p);
-             FOR_PROVIDES(pi, pp, s->name)
+             FOR_PROVIDES(pi, pip, s->name)
                {
                  ps = pool->solvables + pi;
                  if (ps->name != s->name)
                    continue;
                  MAPSET(&solv->dupinvolvedmap, pi);
+                 if (ps->repo == installed && (how & SOLVER_FORCEBEST) != 0)
+                   {
+                     if (!solv->bestupdatemap.size)
+                       map_grow(&solv->bestupdatemap, installed->end - installed->start);
+                     MAPSET(&solv->bestupdatemap, pi - installed->start);
+                   }
                }
              if (s->obsoletes)
                {
-                 /* FIXME: check obsoletes/provides combination */
+                 /* XXX: check obsoletes/provides combination */
                  obsp = s->repo->idarraydata + s->obsoletes;
                  while ((obs = *obsp++) != 0)
                    {
                      FOR_PROVIDES(pi, pp, obs)
                        {
-                         Solvable *pis = pool->solvables + pi;
-                         if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, pis, obs))
+                         Solvable *ps = pool->solvables + pi;
+                         if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs))
                            continue;
-                         if (pool->obsoleteusescolors && !pool_colormatch(pool, s, pis))
+                         if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps))
                            continue;
                          MAPSET(&solv->dupinvolvedmap, pi);
+                         if (ps->repo == installed && (how & SOLVER_FORCEBEST) != 0)
+                           {
+                             if (!solv->bestupdatemap.size)
+                               map_grow(&solv->bestupdatemap, installed->end - installed->start);
+                             MAPSET(&solv->bestupdatemap, pi - installed->start);
+                           }
                        }
                    }
                }
@@ -1227,7 +1338,8 @@ void
 solver_freedupmaps(Solver *solv)
 {
   map_free(&solv->dupmap);
-  map_free(&solv->dupinvolvedmap);
+  /* we no longer free solv->dupinvolvedmap as we need it in
+   * policy's priority pruning code. sigh. */
 }
 
 void
@@ -1275,6 +1387,8 @@ solver_addduprules(Solver *solv, Map *addedmap)
                    }
                  if (!ip)
                    solver_addrule(solv, -p, 0);        /* no match, sorry */
+                 else
+                   MAPSET(&solv->dupmap, p);           /* for best rules processing */
                }
            }
          else if (!MAPTST(&solv->dupmap, p))
@@ -1309,10 +1423,10 @@ reenableduprule(Solver *solv, Id name)
       if (r->p < 0 && r->d < 0 && pool->solvables[-r->p].name == name)
        {
          solver_enablerule(solv, r);
-         IF_POOLDEBUG (SAT_DEBUG_SOLUTIONS)
+         IF_POOLDEBUG (SOLV_DEBUG_SOLUTIONS)
            {
-             POOL_DEBUG(SAT_DEBUG_SOLUTIONS, "@@@ re-enabling ");
-             solver_printruleclass(solv, SAT_DEBUG_SOLUTIONS, r);
+             POOL_DEBUG(SOLV_DEBUG_SOLUTIONS, "@@@ re-enabling ");
+             solver_printruleclass(solv, SOLV_DEBUG_SOLUTIONS, r);
            }
        }
     }
@@ -1332,6 +1446,120 @@ reenableduprule(Solver *solv, Id name)
 #define DISABLE_INFARCH        2
 #define DISABLE_DUP    3
 
+/* 
+ * add all installed packages that package p obsoletes to Queue q.
+ * Package p is not installed. Also, we know that if
+ * solv->keepexplicitobsoletes is not set, p is not in the noobs map.
+ * Entries may get added multiple times.
+ */
+static void
+add_obsoletes(Solver *solv, Id p, Queue *q)
+{
+  Pool *pool = solv->pool;
+  Repo *installed = solv->installed;
+  Id p2, pp2;
+  Solvable *s = pool->solvables + p;
+  Id obs, *obsp;
+  Id lastp2 = 0;
+
+  if (!solv->keepexplicitobsoletes || !(solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p)))
+    {
+      FOR_PROVIDES(p2, pp2, s->name)
+       {
+         Solvable *ps = pool->solvables + p2;
+         if (ps->repo != installed)
+           continue;
+         if (!pool->implicitobsoleteusesprovides && ps->name != s->name)
+           continue;
+         if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) 
+           continue;
+         queue_push(q, p2);
+         lastp2 = p2;
+       }
+    }
+  if (!s->obsoletes)
+    return;
+  obsp = s->repo->idarraydata + s->obsoletes;
+  while ((obs = *obsp++) != 0)
+    FOR_PROVIDES(p2, pp2, obs) 
+      {
+       Solvable *ps = pool->solvables + p2;
+       if (ps->repo != installed)
+         continue;
+       if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs))
+         continue;
+       if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) 
+         continue;
+       if (p2 == lastp2)
+         continue;
+       queue_push(q, p2);
+       lastp2 = p2;
+      }
+}
+
+/*
+ * Call add_obsoletes and intersect the result with the
+ * elements in Queue q starting at qstart.
+ * Assumes that it's the first call if qstart == q->count.
+ * May use auxillary map m for the intersection process, all
+ * elements of q starting at qstart must have their bit cleared.
+ * (This is also true after the function returns.)
+ */
+static void
+intersect_obsoletes(Solver *solv, Id p, Queue *q, int qstart, Map *m)
+{
+  int i, j;
+  int qcount = q->count;
+
+  add_obsoletes(solv, p, q);
+  if (qcount == qstart)
+    return;    /* first call */
+  if (qcount == q->count)
+    j = qstart;        
+  else if (qcount == qstart + 1)
+    {
+      /* easy if there's just one element */
+      j = qstart;
+      for (i = qcount; i < q->count; i++)
+       if (q->elements[i] == q->elements[qstart])
+         {
+           j++;        /* keep the element */
+           break;
+         }
+    }
+  else if (!m->size && q->count - qstart <= 8)
+    {
+      /* faster than a map most of the time */
+      int k;
+      for (i = j = qstart; i < qcount; i++)
+       {
+         Id ip = q->elements[i];
+         for (k = qcount; k < q->count; k++)
+           if (q->elements[k] == ip)
+             {
+               q->elements[j++] = ip;
+               break;
+             }
+       }
+    }
+  else
+    {
+      /* for the really pathologic cases we use the map */
+      Repo *installed = solv->installed;
+      if (!m->size)
+       map_init(m, installed->end - installed->start);
+      for (i = qcount; i < q->count; i++)
+       MAPSET(m, q->elements[i] - installed->start);
+      for (i = j = qstart; i < qcount; i++)
+       if (MAPTST(m, q->elements[i] - installed->start))
+         {
+           MAPCLR(m, q->elements[i] - installed->start);
+           q->elements[j++] = q->elements[i];
+         }
+    }
+  queue_truncate(q, j);
+}
+
 static void
 jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
 {
@@ -1339,7 +1567,7 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
   Id select, p, pp;
   Repo *installed;
   Solvable *s;
-  int i, j, set, qstart, pass;
+  int i, j, set, qstart;
   Map omap;
 
   installed = solv->installed;
@@ -1351,22 +1579,25 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
       if (!(set & SOLVER_NOAUTOSET))
        {
          /* automatically add set bits by analysing the job */
+         if (select == SOLVER_SOLVABLE_NAME)
+           set |= SOLVER_SETNAME;
          if (select == SOLVER_SOLVABLE)
-           set |= SOLVER_SETARCH | SOLVER_SETVENDOR | SOLVER_SETREPO | SOLVER_SETEVR;
+           set |= SOLVER_SETNAME | SOLVER_SETARCH | SOLVER_SETVENDOR | SOLVER_SETREPO | SOLVER_SETEVR;
          else if ((select == SOLVER_SOLVABLE_NAME || select == SOLVER_SOLVABLE_PROVIDES) && ISRELDEP(what))
            {
              Reldep *rd = GETRELDEP(pool, what);
              if (rd->flags == REL_EQ && select == SOLVER_SOLVABLE_NAME)
                {
-#if !defined(DEBIAN_SEMANTICS)
-                 const char *evr = id2str(pool, rd->evr);
-                 if (strchr(evr, '-'))
-                   set |= SOLVER_SETEVR;
+                 if (pool->disttype != DISTTYPE_DEB)
+                   {
+                     const char *evr = pool_id2str(pool, rd->evr);
+                     if (strchr(evr, '-'))
+                       set |= SOLVER_SETEVR;
+                     else
+                       set |= SOLVER_SETEV;
+                   }
                  else
-                   set |= SOLVER_SETEV;
-#else
-                 set |= SOLVER_SETEVR;
-#endif
+                   set |= SOLVER_SETEVR;
                }
              if (rd->flags <= 7 && ISRELDEP(rd->name))
                rd = GETRELDEP(pool, rd->name);
@@ -1385,6 +1616,8 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
          else
            {
              int qcnt = q->count;
+             /* does not work for SOLVER_SOLVABLE_ALL and SOLVER_SOLVABLE_REPO, but
+                they are not useful for SOLVER_INSTALL jobs anyway */
              FOR_JOB_SELECT(p, pp, select, what)
                {
                  s = pool->solvables + p;
@@ -1418,94 +1651,57 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
                }
            }
        }
-      if (!installed)
+      if (!installed || installed->end == installed->start)
        return;
       /* now the hard part: disable some update rules */
 
       /* first check if we have noobs or installed packages in the job */
+      i = j = 0;
       FOR_JOB_SELECT(p, pp, select, what)
        {
          if (pool->solvables[p].repo == installed)
-           {
-             if (select == SOLVER_SOLVABLE)
-               queue_push2(q, DISABLE_UPDATE, what);
-             return;
-           }
-         if (solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p))
+           j = p;
+         else if (solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p) && !solv->keepexplicitobsoletes)
            return;
+         i++;
+       }
+      if (j)   /* have installed packages */
+       {
+         /* this is for dupmap_all jobs, it can go away if we create
+          * duprules for them */
+         if (i == 1 && (set & SOLVER_SETREPO) != 0)
+           queue_push2(q, DISABLE_UPDATE, j);
+         return;
        }
 
-      /* all job packages obsolete */
+      omap.size = 0;
       qstart = q->count;
-      pass = 0;
-      memset(&omap, 0, sizeof(omap));
       FOR_JOB_SELECT(p, pp, select, what)
        {
-         Id p2, pp2;
-
-         if (pass == 1)
-           map_grow(&omap, installed->end - installed->start);
-         s = pool->solvables + p;
-         if (s->obsoletes)
-           {
-             Id obs, *obsp;
-             obsp = s->repo->idarraydata + s->obsoletes;
-             while ((obs = *obsp++) != 0)
-               FOR_PROVIDES(p2, pp2, obs)
-                 {
-                   Solvable *ps = pool->solvables + p2;
-                   if (ps->repo != installed)
-                     continue;
-                   if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs))
-                     continue;
-                   if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps))
-                     continue;
-                   if (pass)
-                     MAPSET(&omap, p2 - installed->start);
-                   else
-                     queue_push2(q, DISABLE_UPDATE, p2);
-                 }
-           }
-         FOR_PROVIDES(p2, pp2, s->name)
-           {
-             Solvable *ps = pool->solvables + p2;
-             if (ps->repo != installed)
-               continue;
-             if (!pool->implicitobsoleteusesprovides && ps->name != s->name)
-               continue;
-             if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps))
-               continue;
-             if (pass)
-               MAPSET(&omap, p2 - installed->start);
-              else
-               queue_push2(q, DISABLE_UPDATE, p2);
-           }
-         if (pass)
-           {
-             for (i = j = qstart; i < q->count; i += 2)
-               {
-                 if (MAPTST(&omap, q->elements[i + 1] - installed->start))
-                   {
-                     MAPCLR(&omap, q->elements[i + 1] - installed->start);
-                     q->elements[j + 1] = q->elements[i + 1];
-                     j += 2;
-                   }
-               }
-             queue_truncate(q, j);
-           }
+         intersect_obsoletes(solv, p, q, qstart, &omap);
          if (q->count == qstart)
            break;
-         pass++;
        }
       if (omap.size)
         map_free(&omap);
 
       if (qstart == q->count)
        return;         /* nothing to prune */
-      if ((set & (SOLVER_SETEVR | SOLVER_SETARCH | SOLVER_SETVENDOR)) == (SOLVER_SETEVR | SOLVER_SETARCH | SOLVER_SETVENDOR))
-       return;         /* all is set */
+
+      /* convert result to (DISABLE_UPDATE, p) pairs */
+      i = q->count;
+      for (j = qstart; j < i; j++)
+       queue_push(q, q->elements[j]);
+      for (j = qstart; j < q->count; j += 2)
+       {
+         q->elements[j] = DISABLE_UPDATE;
+         q->elements[j + 1] = q->elements[i++];
+       }
 
       /* now that we know which installed packages are obsoleted check each of them */
+      if ((set & (SOLVER_SETEVR | SOLVER_SETARCH | SOLVER_SETVENDOR)) == (SOLVER_SETEVR | SOLVER_SETARCH | SOLVER_SETVENDOR))
+       return;         /* all is set, nothing to do */
+
       for (i = j = qstart; i < q->count; i += 2)
        {
          Solvable *is = pool->solvables + q->elements[i + 1];
@@ -1515,6 +1711,8 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
              s = pool->solvables + p;
              if ((set & SOLVER_SETEVR) != 0)
                illegal |= POLICY_ILLEGAL_DOWNGRADE;    /* ignore */
+             if ((set & SOLVER_SETNAME) != 0)
+               illegal |= POLICY_ILLEGAL_NAMECHANGE;   /* ignore */
              if ((set & SOLVER_SETARCH) != 0)
                illegal |= POLICY_ILLEGAL_ARCHCHANGE;   /* ignore */
              if ((set & SOLVER_SETVENDOR) != 0)
@@ -1523,7 +1721,7 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
              if (illegal && illegal == POLICY_ILLEGAL_DOWNGRADE && (set & SOLVER_SETEV) != 0)
                {
                  /* it's ok if the EV is different */
-                 if (evrcmp(pool, is->evr, s->evr, EVRCMP_COMPARE_EVONLY) != 0)
+                 if (pool_evrcmp(pool, is->evr, s->evr, EVRCMP_COMPARE_EVONLY) != 0)
                    illegal = 0;
                }
              if (illegal)
@@ -1543,6 +1741,9 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
     case SOLVER_ERASE:
       if (!installed)
        break;
+      if (select == SOLVER_SOLVABLE_ALL || (select == SOLVER_SOLVABLE_REPO && what == installed->repoid))
+       FOR_REPO_SOLVABLES(installed, p, s)
+         queue_push2(q, DISABLE_UPDATE, p);
       FOR_JOB_SELECT(p, pp, select, what)
        if (pool->solvables[p].repo == installed)
          queue_push2(q, DISABLE_UPDATE, p);
@@ -1578,7 +1779,7 @@ solver_disablepolicyrules(Solver *solv)
     }
   if (solv->cleandepsmap.size)
     {
-      solver_createcleandepsmap(solv);
+      solver_createcleandepsmap(solv, &solv->cleandepsmap, 0);
       for (i = solv->installed->start; i < solv->installed->end; i++)
        if (MAPTST(&solv->cleandepsmap, i - solv->installed->start))
          queue_push2(&allq, DISABLE_UPDATE, i);
@@ -1619,7 +1820,7 @@ solver_reenablepolicyrules(Solver *solv, int jobidx)
 
   queue_init_buffer(&q, qbuf, sizeof(qbuf)/sizeof(*qbuf));
   queue_init_buffer(&allq, allqbuf, sizeof(allqbuf)/sizeof(*allqbuf));
-  jobtodisablelist(solv, job->elements[jobidx], job->elements[jobidx + 1], &q);
+  jobtodisablelist(solv, job->elements[jobidx - 1], job->elements[jobidx], &q);
   if (!q.count)
     return;
   for (i = solv->jobrules; i < solv->jobrules_end; i++)
@@ -1635,7 +1836,7 @@ solver_reenablepolicyrules(Solver *solv, int jobidx)
     }
   if (solv->cleandepsmap.size)
     {
-      solver_createcleandepsmap(solv);
+      solver_createcleandepsmap(solv, &solv->cleandepsmap, 0);
       for (i = solv->installed->start; i < solv->installed->end; i++)
        if (MAPTST(&solv->cleandepsmap, i - solv->installed->start))
          queue_push2(&allq, DISABLE_UPDATE, i);
@@ -1665,6 +1866,38 @@ solver_reenablepolicyrules(Solver *solv, int jobidx)
   queue_free(&q);
 }
 
+/* we just removed a package from the cleandeps map, now reenable all policy rules that were
+ * disabled because of this */
+void
+solver_reenablepolicyrules_cleandeps(Solver *solv, Id pkg)
+{
+  Queue *job = &solv->job;
+  int i, j;
+  Queue allq;
+  Rule *r;
+  Id lastjob = -1;
+  Id allqbuf[128];
+
+  queue_init_buffer(&allq, allqbuf, sizeof(allqbuf)/sizeof(*allqbuf));
+  for (i = solv->jobrules; i < solv->jobrules_end; i++)
+    {
+      r = solv->rules + i;
+      if (r->d < 0)    /* disabled? */
+       continue;
+      j = solv->ruletojob.elements[i - solv->jobrules];
+      if (j == lastjob)
+       continue;
+      lastjob = j;
+      jobtodisablelist(solv, job->elements[j], job->elements[j + 1], &allq);
+    }
+  for (i = 0; i < allq.count; i += 2)
+    if (allq.elements[i] == DISABLE_UPDATE && allq.elements[i + 1] == pkg)
+      break;
+  if (i == allq.count)
+    reenableupdaterule(solv, pkg);
+  queue_free(&allq);
+}
+
 
 /***********************************************************************
  ***
@@ -1805,7 +2038,7 @@ solver_allruleinfos(Solver *solv, Id rid, Queue *rq)
   /* now sort & unify em */
   if (!rq->count)
     return 0;
-  sat_sort(rq->elements, rq->count / 4, 4 * sizeof(Id), solver_allruleinfos_cmp, 0);
+  solv_sort(rq->elements, rq->count / 4, 4 * sizeof(Id), solver_allruleinfos_cmp, 0);
   /* throw out identical entries */
   for (i = j = 0; i < rq->count; i += 4)
     {
@@ -1887,8 +2120,13 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp)
        *top = solv->job.elements[jidx];
       if (depp)
        *depp = solv->job.elements[jidx + 1];
-      if ((r->d == 0 || r->d == -1) && r->w2 == 0 && r->p == -SYSTEMSOLVABLE && (solv->job.elements[jidx] & SOLVER_SELECTMASK) != SOLVER_SOLVABLE_ONE_OF)
-       return SOLVER_RULE_JOB_NOTHING_PROVIDES_DEP;
+      if ((r->d == 0 || r->d == -1) && r->w2 == 0 && r->p == -SYSTEMSOLVABLE)
+       {
+         if ((solv->job.elements[jidx] & SOLVER_SELECTMASK) == SOLVER_SOLVABLE_NAME)
+           return SOLVER_RULE_JOB_NOTHING_PROVIDES_DEP;
+         if ((solv->job.elements[jidx] & SOLVER_SELECTMASK) == SOLVER_SOLVABLE_PROVIDES)
+           return SOLVER_RULE_JOB_NOTHING_PROVIDES_DEP;
+       }
       return SOLVER_RULE_JOB;
     }
   if (rid >= solv->updaterules && rid < solv->updaterules_end)
@@ -1919,6 +2157,10 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp)
        *depp = pool->solvables[-r->p].name;
       return SOLVER_RULE_INFARCH;
     }
+  if (rid >= solv->bestrules && rid < solv->bestrules_end)
+    {
+      return SOLVER_RULE_BEST;
+    }
   if (rid >= solv->choicerules && rid < solv->choicerules_end)
     {
       return SOLVER_RULE_CHOICE;
@@ -1930,6 +2172,72 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp)
   return SOLVER_RULE_UNKNOWN;
 }
 
+SolverRuleinfo
+solver_ruleclass(Solver *solv, Id rid)
+{
+  if (rid <= 0)
+    return SOLVER_RULE_UNKNOWN;
+  if (rid > 0 && rid < solv->rpmrules_end)
+    return SOLVER_RULE_RPM;
+  if (rid >= solv->jobrules && rid < solv->jobrules_end)
+    return SOLVER_RULE_JOB;
+  if (rid >= solv->updaterules && rid < solv->updaterules_end)
+    return SOLVER_RULE_UPDATE;
+  if (rid >= solv->featurerules && rid < solv->featurerules_end)
+    return SOLVER_RULE_FEATURE;
+  if (rid >= solv->duprules && rid < solv->duprules_end)
+    return SOLVER_RULE_DISTUPGRADE;
+  if (rid >= solv->infarchrules && rid < solv->infarchrules_end)
+    return SOLVER_RULE_INFARCH;
+  if (rid >= solv->bestrules && rid < solv->bestrules_end)
+    return SOLVER_RULE_BEST;
+  if (rid >= solv->choicerules && rid < solv->choicerules_end)
+    return SOLVER_RULE_CHOICE;
+  if (rid >= solv->learntrules)
+    return SOLVER_RULE_LEARNT;
+  return SOLVER_RULE_UNKNOWN;
+}
+
+void
+solver_ruleliterals(Solver *solv, Id rid, Queue *q)
+{
+  Pool *pool = solv->pool;
+  Id p, pp;
+  Rule *r;
+
+  queue_empty(q);
+  r = solv->rules + rid;
+  FOR_RULELITERALS(p, pp, r)
+    if (p != -SYSTEMSOLVABLE)
+      queue_push(q, p);
+  if (!q->count)
+    queue_push(q, -SYSTEMSOLVABLE);    /* hmm, better to return an empty result? */
+}
+
+int
+solver_rule2jobidx(Solver *solv, Id rid)
+{
+  if (rid < solv->jobrules || rid >= solv->jobrules_end)
+    return 0;
+  return solv->ruletojob.elements[rid - solv->jobrules] + 1;
+}
+
+Id
+solver_rule2job(Solver *solv, Id rid, Id *whatp)
+{
+  int idx;
+  if (rid < solv->jobrules || rid >= solv->jobrules_end)
+    {
+      if (whatp)
+       *whatp = 0;
+      return 0;
+    }
+  idx = solv->ruletojob.elements[rid - solv->jobrules];
+  if (whatp)
+    *whatp = solv->job.elements[idx + 1];
+  return solv->job.elements[idx];
+}
+
 void
 solver_addchoicerules(Solver *solv)
 {
@@ -1938,9 +2246,11 @@ solver_addchoicerules(Solver *solv)
   Rule *r;
   Queue q, qi;
   int i, j, rid, havechoice;
-  Id p, d, *pp;
+  Id p, d, pp;
   Id p2, pp2;
   Solvable *s, *s2;
+  Id lastaddedp, lastaddedd;
+  int lastaddedcnt;
 
   solv->choicerules = solv->nrules;
   if (!pool->installed)
@@ -1948,7 +2258,7 @@ solver_addchoicerules(Solver *solv)
       solv->choicerules_end = solv->nrules;
       return;
     }
-  solv->choicerules_ref = sat_calloc(solv->rpmrules_end, sizeof(Id));
+  solv->choicerules_ref = solv_calloc(solv->rpmrules_end, sizeof(Id));
   queue_init(&q);
   queue_init(&qi);
   map_init(&m, pool->nsolvables);
@@ -1960,12 +2270,15 @@ solver_addchoicerules(Solver *solv)
   for (rid = solv->duprules, r = solv->rules + rid; rid < solv->duprules_end; rid++, r++)
     if (r->p < 0 && !r->w2 && (r->d == 0 || r->d == -1))
       MAPSET(&mneg, -r->p);
+  lastaddedp = 0;
+  lastaddedd = 0;
+  lastaddedcnt = 0;
   for (rid = 1; rid < solv->rpmrules_end ; rid++)
     {
       r = solv->rules + rid;
       if (r->p >= 0 || ((r->d == 0 || r->d == -1) && r->w2 < 0))
        continue;       /* only look at requires rules */
-      // solver_printrule(solv, SAT_DEBUG_RESULT, r);
+      /* solver_printrule(solv, SOLV_DEBUG_RESULT, r); */
       queue_empty(&q);
       queue_empty(&qi);
       havechoice = 0;
@@ -2052,9 +2365,10 @@ solver_addchoicerules(Solver *solv)
          MAPSET(&m, p);
       for (i = 0; i < qi.count; i++)
        {
+         Rule *ur;
          if (!qi.elements[i])
            continue;
-         Rule *ur = solv->rules + solv->updaterules + (qi.elements[i] - pool->installed->start);
+         ur = solv->rules + solv->updaterules + (qi.elements[i] - pool->installed->start);
          if (!ur->p)
            ur = solv->rules + solv->featurerules + (qi.elements[i] - pool->installed->start);
          if (!ur->p)
@@ -2072,19 +2386,33 @@ solver_addchoicerules(Solver *solv)
        {
 #if 0
          printf("skipping choice ");
-         solver_printrule(solv, SAT_DEBUG_RESULT, solv->rules + rid);
+         solver_printrule(solv, SOLV_DEBUG_RESULT, solv->rules + rid);
 #endif
          continue;
        }
+
+      /* don't add identical rules */
+      if (lastaddedp == r->p && lastaddedcnt == q.count)
+       {
+         for (i = 0; i < q.count; i++)
+           if (q.elements[i] != pool->whatprovidesdata[lastaddedd + i])
+             break;
+         if (i == q.count)
+           continue;   /* already added that one */
+       }
+
       d = q.count ? pool_queuetowhatprovides(pool, &q) : 0;
       solver_addrule(solv, r->p, d);
       queue_push(&solv->weakruleq, solv->nrules - 1);
       solv->choicerules_ref[solv->nrules - 1 - solv->choicerules] = rid;
+      lastaddedp = r->p;
+      lastaddedd = d;
+      lastaddedcnt = q.count;
 #if 0
       printf("OLD ");
-      solver_printrule(solv, SAT_DEBUG_RESULT, solv->rules + rid);
+      solver_printrule(solv, SOLV_DEBUG_RESULT, solv->rules + rid);
       printf("WEAK CHOICE ");
-      solver_printrule(solv, SAT_DEBUG_RESULT, solv->rules + solv->nrules - 1);
+      solver_printrule(solv, SOLV_DEBUG_RESULT, solv->rules + solv->nrules - 1);
 #endif
     }
   queue_free(&q);
@@ -2100,7 +2428,7 @@ solver_addchoicerules(Solver *solv)
 void
 solver_disablechoicerules(Solver *solv, Rule *r)
 {
-  Id rid, p, *pp;
+  Id rid, p, pp;
   Pool *pool = solv->pool;
   Map m;
   Rule *or;
@@ -2127,74 +2455,498 @@ solver_disablechoicerules(Solver *solv, Rule *r)
     }
 }
 
-static void solver_createcleandepsmap(Solver *solv)
+static void
+prune_to_update_targets(Solver *solv, Id *cp, Queue *q)
+{
+  int i, j;
+  Id p, *cp2; 
+  for (i = j = 0; i < q->count; i++)
+    {  
+      p = q->elements[i];
+      for (cp2 = cp; *cp2; cp2++)
+        if (*cp2 == p)
+          {
+            q->elements[j++] = p;
+            break;
+          }
+    }
+  queue_truncate(q, j);
+}
+
+static void
+prune_to_dup_packages(Solver *solv, Id p, Queue *q)
+{
+  int i, j;
+  for (i = j = 0; i < q->count; i++)
+    {
+      Id p = q->elements[i];
+      if (MAPTST(&solv->dupmap, p))
+       q->elements[j++] = p;
+    }
+  queue_truncate(q, j);
+}
+
+void
+solver_addbestrules(Solver *solv, int havebestinstalljobs)
 {
   Pool *pool = solv->pool;
+  Id p;
+  Solvable *s;
   Repo *installed = solv->installed;
-  Queue *job = &solv->job;
-  Map userinstalled;
-  Map im;
-  Map installedm;
+  Queue q, q2;
   Rule *r;
-  Id rid, how, what, select;
-  Id p, pp, ip, *jp;
-  Id req, *reqp, sup, *supp;
-  Solvable *s;
-  Queue iq;
-  int i;
+  Queue r2pkg;
+  int i, oldcnt;
 
-  map_init(&userinstalled, installed->end - installed->start);
-  map_init(&im, pool->nsolvables);
-  map_init(&installedm, pool->nsolvables);
-  map_empty(&solv->cleandepsmap);
-  queue_init(&iq);
+  solv->bestrules = solv->nrules;
+  if (!installed)
+    {
+      solv->bestrules_end = solv->nrules;
+      return;
+    }
+  queue_init(&q);
+  queue_init(&q2);
+  queue_init(&r2pkg);
 
-  for (i = 0; i < job->count; i += 2)
+  if (havebestinstalljobs)
     {
-      how = job->elements[i];
-      if ((how & SOLVER_JOBMASK) == SOLVER_USERINSTALLED)
+      for (i = 0; i < solv->job.count; i += 2)
        {
-         what = job->elements[i + 1];
-         select = how & SOLVER_SELECTMASK;
-         FOR_JOB_SELECT(p, pp, select, what)
-           if (pool->solvables[p].repo == installed)
-             MAPSET(&userinstalled, p - installed->start);
+         if ((solv->job.elements[i] & (SOLVER_JOBMASK | SOLVER_FORCEBEST)) == (SOLVER_INSTALL | SOLVER_FORCEBEST))
+           {
+             int j;
+             Id p2, pp2;
+             for (j = 0; j < solv->ruletojob.count; j++)
+               if (solv->ruletojob.elements[j] == i)
+                 break;
+             if (j == solv->ruletojob.count)
+               continue;
+             r = solv->rules + solv->jobrules + j;
+             queue_empty(&q);
+             FOR_RULELITERALS(p2, pp2, r)
+               if (p2 > 0)
+                 queue_push(&q, p2);
+             if (!q.count)
+               continue;       /* orphaned */
+             /* select best packages, just look at prio and version */
+             oldcnt = q.count;
+             policy_filter_unwanted(solv, &q, POLICY_MODE_RECOMMEND);
+             if (q.count == oldcnt)
+               continue;       /* nothing filtered */
+             p2 = queue_shift(&q);
+             solver_addrule(solv, p2, q.count ? pool_queuetowhatprovides(pool, &q) : 0);
+             queue_push(&r2pkg, -(solv->jobrules + j));
+           }
        }
     }
-  /* add all positive elements (e.g. locks) to "userinstalled" */
-  for (rid = solv->jobrules; rid < solv->jobrules_end; rid++)
+
+  if (solv->bestupdatemap_all || solv->bestupdatemap.size)
     {
-      r = solv->rules + rid;
-      if (r->d < 0)
-       continue;
-      FOR_RULELITERALS(p, jp, r)
-       if (p > 0 && pool->solvables[p].repo == installed)
-         MAPSET(&userinstalled, p - installed->start);
-    }
+      FOR_REPO_SOLVABLES(installed, p, s)
+       {
+         Id d, p2, pp2;
+         if (!solv->updatemap_all && (!solv->updatemap.size || !MAPTST(&solv->updatemap, p - installed->start)))
+           continue;
+         if (!solv->bestupdatemap_all && (!solv->bestupdatemap.size || !MAPTST(&solv->bestupdatemap, p - installed->start)))
+           continue;
+         queue_empty(&q);
+         if (solv->bestobeypolicy)
+           r = solv->rules + solv->updaterules + (p - installed->start);
+         else
+           {
+             r = solv->rules + solv->featurerules + (p - installed->start);
+             if (!r->p)        /* identical to update rule? */
+               r = solv->rules + solv->updaterules + (p - installed->start);
+           }
+         if (solv->multiversionupdaters && (d = solv->multiversionupdaters[p - installed->start]) != 0 && r == solv->rules + solv->updaterules + (p - installed->start))
+           {
+             /* need to check multiversionupdaters */
+             if (r->p == p)    /* be careful with the dup case */
+               queue_push(&q, p);
+             while ((p2 = pool->whatprovidesdata[d++]) != 0)
+               queue_push(&q, p2);
+           }
+         else
+           {
+             FOR_RULELITERALS(p2, pp2, r)
+               if (p2 > 0)
+                 queue_push(&q, p2);
+           }
+         if (solv->update_targets && solv->update_targets->elements[p - installed->start])
+           prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[p - installed->start], &q);
+         if (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p))
+           prune_to_dup_packages(solv, p, &q);
+         /* select best packages, just look at prio and version */
+         policy_filter_unwanted(solv, &q, POLICY_MODE_RECOMMEND);
+         if (!q.count)
+           continue;   /* orphaned */
+         if (solv->bestobeypolicy)
+           {
+             /* also filter the best of the feature rule packages and add them */
+             r = solv->rules + solv->featurerules + (p - installed->start);
+             if (r->p)
+               {
+                 int j;
+                 queue_empty(&q2);
+                 FOR_RULELITERALS(p2, pp2, r)
+                   if (p2 > 0)
+                     queue_push(&q2, p2);
+                 if (solv->update_targets && solv->update_targets->elements[p - installed->start])
+                   prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[p - installed->start], &q2);
+                 if (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p))
+                   prune_to_dup_packages(solv, p, &q);
+                 policy_filter_unwanted(solv, &q2, POLICY_MODE_RECOMMEND);
+                 for (j = 0; j < q2.count; j++)
+                   queue_pushunique(&q, q2.elements[j]);
+               }
+           }
+         p2 = queue_shift(&q);
+         solver_addrule(solv, p2, q.count ? pool_queuetowhatprovides(pool, &q) : 0);
+         queue_push(&r2pkg, p);
+       }
+    }
+  if (r2pkg.count)
+    {
+      solv->bestrules_pkg = solv_calloc(r2pkg.count, sizeof(Id));
+      memcpy(solv->bestrules_pkg, r2pkg.elements, r2pkg.count * sizeof(Id));
+    }
+  solv->bestrules_end = solv->nrules;
+  queue_free(&q);
+  queue_free(&q2);
+  queue_free(&r2pkg);
+}
+
+#undef CLEANDEPSDEBUG
+
+/*
+ * This functions collects all packages that are looked at
+ * when a dependency is checked. We need it to "pin" installed
+ * packages when removing a supplemented package in createcleandepsmap.
+ * Here's an not uncommon example:
+ *   A contains "Supplements: packageand(B, C)"
+ *   B contains "Requires: A"
+ * Now if we remove C, the supplements is no longer true,
+ * thus we also remove A. Without the dep_pkgcheck function, we
+ * would now also remove B, but this is wrong, as adding back
+ * C doesn't make the supplements true again. Thus we "pin" B
+ * when we remove A.
+ * There's probably a better way to do this, but I haven't come
+ * up with it yet ;)
+ */
+static inline void
+dep_pkgcheck(Solver *solv, Id dep, Map *m, Queue *q)
+{
+  Pool *pool = solv->pool;
+  Id p, pp;
+
+  if (ISRELDEP(dep))
+    {
+      Reldep *rd = GETRELDEP(pool, dep);
+      if (rd->flags >= 8)
+       {
+         if (rd->flags == REL_AND)
+           {
+             dep_pkgcheck(solv, rd->name, m, q);
+             dep_pkgcheck(solv, rd->evr, m, q);
+             return;
+           }
+         if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
+           return;
+         if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
+           return;
+       }
+    }
+  FOR_PROVIDES(p, pp, dep)
+    if (!m || MAPTST(m, p))
+      queue_push(q, p);
+}
+
+/*
+ * Find all installed packages that are no longer
+ * needed regarding the current solver job.
+ *
+ * The algorithm is:
+ * - remove pass: remove all packages that could have
+ *   been dragged in by the obsoleted packages.
+ *   i.e. if package A is obsolete and contains "Requires: B",
+ *   also remove B, as installing A will have pulled in B.
+ *   after this pass, we have a set of still installed packages
+ *   with broken dependencies.
+ * - add back pass:
+ *   now add back all packages that the still installed packages
+ *   require.
+ *
+ * The cleandeps packages are the packages removed in the first
+ * pass and not added back in the second pass.
+ *
+ * If we search for unneeded packages (unneeded is true), we
+ * simply remove all packages except the userinstalled ones in
+ * the first pass.
+ */
+static void
+solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded)
+{
+  Pool *pool = solv->pool;
+  Repo *installed = solv->installed;
+  Queue *job = &solv->job;
+  Map userinstalled;
+  Map im;
+  Map installedm;
+  Rule *r;
+  Id rid, how, what, select;
+  Id p, pp, ip, jp;
+  Id req, *reqp, sup, *supp;
+  Solvable *s;
+  Queue iq;
+  int i;
+
+  map_empty(cleandepsmap);
+  if (!installed || installed->end == installed->start)
+    return;
+  map_init(&userinstalled, installed->end - installed->start);
+  map_init(&im, pool->nsolvables);
+  map_init(&installedm, pool->nsolvables);
+  queue_init(&iq);
+
+  for (i = 0; i < job->count; i += 2)
+    {
+      how = job->elements[i];
+      if ((how & SOLVER_JOBMASK) == SOLVER_USERINSTALLED)
+       {
+         what = job->elements[i + 1];
+         select = how & SOLVER_SELECTMASK;
+         if (select == SOLVER_SOLVABLE_ALL || (select == SOLVER_SOLVABLE_REPO && what == installed->repoid))
+           FOR_REPO_SOLVABLES(installed, p, s)
+             MAPSET(&userinstalled, p - installed->start);
+         FOR_JOB_SELECT(p, pp, select, what)
+           if (pool->solvables[p].repo == installed)
+             MAPSET(&userinstalled, p - installed->start);
+       }
+    }
+
+  /* also add visible patterns to userinstalled for openSUSE */
+  if (1)
+    {
+      Dataiterator di;
+      dataiterator_init(&di, pool, 0, 0, SOLVABLE_ISVISIBLE, 0, 0);
+      while (dataiterator_step(&di))
+       {
+         Id *dp;
+         if (di.solvid <= 0)
+           continue;
+         s = pool->solvables + di.solvid;
+         if (!s->repo || !s->requires)
+           continue;
+         if (s->repo != installed && !pool_installable(pool, s))
+           continue;
+         if (strncmp(pool_id2str(pool, s->name), "pattern:", 8) != 0)
+           continue;
+         dp = s->repo->idarraydata + s->requires;
+         for (dp = s->repo->idarraydata + s->requires; *dp; dp++)
+           FOR_PROVIDES(p, pp, *dp)
+             if (pool->solvables[p].repo == installed)
+               {
+                 if (strncmp(pool_id2str(pool, pool->solvables[p].name), "pattern", 7) != 0)
+                   continue;
+                 MAPSET(&userinstalled, p - installed->start);
+               }
+       }
+      dataiterator_free(&di);
+    }
+  if (1)
+    {
+      /* all products and their buddies are userinstalled */
+      for (p = installed->start; p < installed->end; p++)
+       {
+         Solvable *s = pool->solvables + p;
+         if (s->repo != installed)
+           continue;
+         if (!strncmp("product:", pool_id2str(pool, s->name), 8))
+           {
+             MAPSET(&userinstalled, p - installed->start);
+             if (pool->nscallback)
+               {
+                 Id buddy = pool->nscallback(pool, pool->nscallbackdata, NAMESPACE_PRODUCTBUDDY, p);
+                 if (buddy >= installed->start && buddy < installed->end && pool->solvables[buddy].repo == installed)
+                   MAPSET(&userinstalled, buddy - installed->start);
+               }
+           }
+       }
+    }
+  
+  /* add all positive elements (e.g. locks) to "userinstalled" */
   for (rid = solv->jobrules; rid < solv->jobrules_end; rid++)
     {
       r = solv->rules + rid;
-      if (r->p >= 0 || r->d != 0)
-       continue;       /* disabled or not erase */
-      p = -r->p;
+      if (r->d < 0)
+       continue;
+      i = solv->ruletojob.elements[rid - solv->jobrules];
+      if ((job->elements[i] & SOLVER_CLEANDEPS) == SOLVER_CLEANDEPS)
+       continue;
+      FOR_RULELITERALS(p, jp, r)
+       if (p > 0 && pool->solvables[p].repo == installed)
+         MAPSET(&userinstalled, p - installed->start);
+    }
+
+  /* add all cleandeps candidates to iq */
+  for (rid = solv->jobrules; rid < solv->jobrules_end; rid++)
+    {
+      r = solv->rules + rid;
+      if (r->d < 0)
+       continue;
+      if (r->d == 0 && r->p < 0 && r->w2 == 0)
+       {
+         p = -r->p;
+         if (pool->solvables[p].repo != installed)
+           continue;
+         MAPCLR(&userinstalled, p - installed->start);
+         if (unneeded)
+           continue;
+         i = solv->ruletojob.elements[rid - solv->jobrules];
+         how = job->elements[i];
+         if ((how & (SOLVER_JOBMASK|SOLVER_CLEANDEPS)) == (SOLVER_ERASE|SOLVER_CLEANDEPS))
+           queue_push(&iq, p);
+       }
+      else if (r->p > 0)
+       {
+         if (unneeded)
+           continue;
+         i = solv->ruletojob.elements[rid - solv->jobrules];
+         if ((job->elements[i] & SOLVER_CLEANDEPS) == SOLVER_CLEANDEPS)
+           {
+             /* check if the literals all obsolete some installed package */
+             Map om;
+             int iqstart;
+
+             /* just one installed literal */
+             if (r->d == 0 && r->w2 == 0 && pool->solvables[r->p].repo == installed)
+               continue;
+             /* noobs is bad */
+             if (solv->noobsoletes.size && !solv->keepexplicitobsoletes)
+               {
+                 FOR_RULELITERALS(p, jp, r)
+                   if (MAPTST(&solv->noobsoletes, p))
+                     break;
+                 if (p)
+                   continue;
+               }
+
+             om.size = 0;
+             iqstart = iq.count;
+             FOR_RULELITERALS(p, jp, r)
+               {
+                 if (p < 0)
+                   {
+                     queue_truncate(&iq, iqstart);     /* abort */
+                     break;
+                   }
+                 if (pool->solvables[p].repo == installed)
+                   {
+                     if (iq.count == iqstart)
+                       queue_push(&iq, p);
+                     else
+                       {
+                         for (i = iqstart; i < iq.count; i++)
+                           if (iq.elements[i] == p)
+                             break;
+                         queue_truncate(&iq, iqstart);
+                         if (i < iq.count)
+                           queue_push(&iq, p);
+                       }
+                   }
+                 else
+                   intersect_obsoletes(solv, p, &iq, iqstart, &om);
+                 if (iq.count == iqstart)
+                   break;
+               }
+             if (om.size)
+               map_free(&om);
+           }
+       }
+    }
+
+  if (!unneeded)
+    {
+      if (solv->cleandeps_updatepkgs)
+       for (i = 0; i < solv->cleandeps_updatepkgs->count; i++)
+         queue_push(&iq, solv->cleandeps_updatepkgs->elements[i]);
+    }
+
+  if (unneeded)
+    queue_empty(&iq);  /* just in case... */
+
+  /* clear userinstalled bit for the packages we really want to delete/update */
+  for (i = 0; i < iq.count; i++)
+    {
+      p = iq.elements[i];
       if (pool->solvables[p].repo != installed)
        continue;
       MAPCLR(&userinstalled, p - installed->start);
-      i = solv->ruletojob.elements[rid - solv->jobrules];
-      how = job->elements[i];
-      if ((how & (SOLVER_JOBMASK|SOLVER_CLEANDEPS)) == (SOLVER_ERASE|SOLVER_CLEANDEPS))
-       queue_push(&iq, p);
     }
+
   for (p = installed->start; p < installed->end; p++)
     {
       if (pool->solvables[p].repo != installed)
        continue;
       MAPSET(&installedm, p);
+      if (unneeded && !MAPTST(&userinstalled, p - installed->start))
+       continue;
       MAPSET(&im, p);
     }
 
-  while (iq.count)
+#ifdef CLEANDEPSDEBUG
+  printf("REMOVE PASS\n");
+#endif
+
+  for (;;)
     {
+      if (!iq.count)
+       {
+         if (unneeded)
+           break;
+         /* supplements pass */
+         for (ip = solv->installed->start; ip < solv->installed->end; ip++)
+           {
+             if (!MAPTST(&installedm, ip))
+               continue;
+             s = pool->solvables + ip;
+             if (!s->supplements)
+               continue;
+             if (!MAPTST(&im, ip))
+               continue;
+             if (MAPTST(&userinstalled, ip - installed->start))
+               continue;
+             supp = s->repo->idarraydata + s->supplements;
+             while ((sup = *supp++) != 0)
+               if (dep_possible(solv, sup, &im))
+                 break;
+             if (!sup)
+               {
+                 supp = s->repo->idarraydata + s->supplements;
+                 while ((sup = *supp++) != 0)
+                   if (dep_possible(solv, sup, &installedm))
+                     {
+                       /* no longer supplemented, also erase */
+                       int iqcount = iq.count;
+                       /* pin packages, see comment above dep_pkgcheck */
+                       dep_pkgcheck(solv, sup, &im, &iq);
+                       for (i = iqcount; i < iq.count; i++)
+                         {
+                           Id pqp = iq.elements[i];
+                           if (pool->solvables[pqp].repo == installed)
+                             MAPSET(&userinstalled, pqp - installed->start);
+                         }
+                       queue_truncate(&iq, iqcount);
+#ifdef CLEANDEPSDEBUG
+                       printf("%s supplemented\n", pool_solvid2str(pool, ip));
+#endif
+                       queue_push(&iq, ip);
+                     }
+               }
+           }
+         if (!iq.count)
+           break;
+       }
       ip = queue_shift(&iq);
       s = pool->solvables + ip;
       if (!MAPTST(&im, ip))
@@ -2205,7 +2957,7 @@ static void solver_createcleandepsmap(Solver *solv)
        continue;
       MAPCLR(&im, ip);
 #ifdef CLEANDEPSDEBUG
-      printf("hello %s\n", solvable2str(pool, s));
+      printf("removing %s\n", pool_solvable2str(pool, s));
 #endif
       if (s->requires)
        {
@@ -2228,7 +2980,7 @@ static void solver_createcleandepsmap(Solver *solv)
                  if (MAPTST(&im, p))
                    {
 #ifdef CLEANDEPSDEBUG
-                     printf("%s requires %s\n", solvid2str(pool, ip), solvid2str(pool, p));
+                     printf("%s requires %s\n", pool_solvid2str(pool, ip), pool_solvid2str(pool, p));
 #endif
                      queue_push(&iq, p);
                    }
@@ -2253,39 +3005,13 @@ static void solver_createcleandepsmap(Solver *solv)
                  if (MAPTST(&im, p))
                    {
 #ifdef CLEANDEPSDEBUG
-                     printf("%s recommends %s\n", solvid2str(pool, ip), solvid2str(pool, p));
+                     printf("%s recommends %s\n", pool_solvid2str(pool, ip), pool_solvid2str(pool, p));
 #endif
                      queue_push(&iq, p);
                    }
                }
            }
        }
-      if (!iq.count)
-       {
-         /* supplements pass */
-         for (ip = solv->installed->start; ip < solv->installed->end; ip++)
-           {
-             if (!MAPTST(&installedm, ip))
-               continue;
-             s = pool->solvables + ip;
-             if (!s->supplements)
-               continue;
-             if (!MAPTST(&im, ip))
-               continue;
-             supp = s->repo->idarraydata + s->supplements;
-             while ((sup = *supp++) != 0)
-               if (!dep_possible(solv, sup, &im) && dep_possible(solv, sup, &installedm))
-                 break;
-             /* no longer supplemented, also erase */
-             if (sup)
-               {
-#ifdef CLEANDEPSDEBUG
-                 printf("%s supplemented\n", solvid2str(pool, ip));
-#endif
-                 queue_push(&iq, ip);
-               }
-           }
-       }
     }
 
   /* turn userinstalled into remove set for pruning */
@@ -2293,7 +3019,7 @@ static void solver_createcleandepsmap(Solver *solv)
   for (rid = solv->jobrules; rid < solv->jobrules_end; rid++)
     {
       r = solv->rules + rid;
-      if (r->p >= 0 || r->d != 0)
+      if (r->p >= 0 || r->d != 0 || r->w2 != 0)
        continue;       /* disabled or not erase */
       p = -r->p;
       MAPCLR(&im, p);
@@ -2325,12 +3051,46 @@ static void solver_createcleandepsmap(Solver *solv)
             queue_push(&iq, what);
        }
     }
-  while (iq.count)
+
+#ifdef CLEANDEPSDEBUG
+  printf("ADDBACK PASS\n");
+#endif
+  for (;;)
     {
+      if (!iq.count)
+       {
+         /* supplements pass */
+         for (ip = installed->start; ip < installed->end; ip++)
+           {
+             if (!MAPTST(&installedm, ip))
+               continue;
+             if (MAPTST(&userinstalled, ip - installed->start))
+               continue;
+             s = pool->solvables + ip;
+             if (!s->supplements)
+               continue;
+             if (MAPTST(&im, ip))
+               continue;
+             supp = s->repo->idarraydata + s->supplements;
+             while ((sup = *supp++) != 0)
+               if (dep_possible(solv, sup, &im))
+                 break;
+             if (sup)
+               {
+#ifdef CLEANDEPSDEBUG
+                 printf("%s supplemented\n", pool_solvid2str(pool, ip));
+#endif
+                 MAPSET(&im, ip);
+                 queue_push(&iq, ip);
+               }
+           }
+         if (!iq.count)
+           break;
+       }
       ip = queue_shift(&iq);
       s = pool->solvables + ip;
 #ifdef CLEANDEPSDEBUG
-      printf("bye %s\n", solvable2str(pool, s));
+      printf("adding back %s\n", pool_solvable2str(pool, s));
 #endif
       if (s->requires)
        {
@@ -2346,7 +3106,7 @@ static void solver_createcleandepsmap(Solver *solv)
                      if (MAPTST(&userinstalled, p - installed->start))
                        continue;
 #ifdef CLEANDEPSDEBUG
-                     printf("%s requires %s\n", solvid2str(pool, ip), solvid2str(pool, p));
+                     printf("%s requires %s\n", pool_solvid2str(pool, ip), pool_solvid2str(pool, p));
 #endif
                      MAPSET(&im, p);
                      queue_push(&iq, p);
@@ -2368,7 +3128,7 @@ static void solver_createcleandepsmap(Solver *solv)
                      if (MAPTST(&userinstalled, p - installed->start))
                        continue;
 #ifdef CLEANDEPSDEBUG
-                     printf("%s recommends %s\n", solvid2str(pool, ip), solvid2str(pool, p));
+                     printf("%s recommends %s\n", pool_solvid2str(pool, ip), pool_solvid2str(pool, p));
 #endif
                      MAPSET(&im, p);
                      queue_push(&iq, p);
@@ -2376,43 +3136,21 @@ static void solver_createcleandepsmap(Solver *solv)
                }
            }
        }
-      if (!iq.count)
-       {
-         /* supplements pass */
-         for (ip = installed->start; ip < installed->end; ip++)
-           {
-             if (!MAPTST(&installedm, ip))
-               continue;
-             if (MAPTST(&userinstalled, ip - installed->start))
-               continue;
-             s = pool->solvables + ip;
-             if (!s->supplements)
-               continue;
-             if (MAPTST(&im, ip) || !MAPTST(&installedm, ip))
-               continue;
-             supp = s->repo->idarraydata + s->supplements;
-             while ((sup = *supp++) != 0)
-               if (dep_possible(solv, sup, &im))
-                 break;
-             if (sup)
-               {
-#ifdef CLEANDEPSDEBUG
-                 printf("%s supplemented\n", solvid2str(pool, ip));
-#endif
-                 MAPSET(&im, ip);
-                 queue_push(&iq, ip);
-               }
-           }
-       }
     }
     
   queue_free(&iq);
+  if (solv->cleandeps_updatepkgs)
+    for (i = 0; i < solv->cleandeps_updatepkgs->count; i++)
+      MAPSET(&im, solv->cleandeps_updatepkgs->elements[i]);
+  if (solv->cleandeps_mistakes)
+    for (i = 0; i < solv->cleandeps_mistakes->count; i++)
+      MAPSET(&im, solv->cleandeps_mistakes->elements[i]);
   for (p = installed->start; p < installed->end; p++)
     {
       if (pool->solvables[p].repo != installed)
        continue;
       if (!MAPTST(&im, p))
-        MAPSET(&solv->cleandepsmap, p - installed->start);
+        MAPSET(cleandepsmap, p - installed->start);
     }
   map_free(&im);
   map_free(&installedm);
@@ -2420,4 +3158,259 @@ static void solver_createcleandepsmap(Solver *solv)
 }
 
 
+struct trj_data {
+  Queue *edges;
+  Id *low;
+  Id idx;
+  Id nstack;
+  Id firstidx;
+};
+
+/* Tarjan's SCC algorithm, slightly modifed */
+static void
+trj_visit(struct trj_data *trj, Id node)
+{
+  Id *low = trj->low;
+  Queue *edges = trj->edges;
+  Id nnode, myidx, stackstart;
+  int i;
+
+  low[node] = myidx = trj->idx++;
+  low[(stackstart = trj->nstack++)] = node;
+  for (i = edges->elements[node]; (nnode = edges->elements[i]) != 0; i++)
+    {
+      Id l = low[nnode];
+      if (!l)
+       {
+         if (!edges->elements[edges->elements[nnode]])
+           {
+             trj->idx++;
+             low[nnode] = -1;
+             continue;
+           }
+         trj_visit(trj, nnode);
+         l = low[nnode];
+       }
+      if (l < 0)
+       continue;
+      if (l < trj->firstidx)
+       {
+         int k;
+         for (k = l; low[low[k]] == l; k++)
+           low[low[k]] = -1;
+       }
+      else if (l < low[node])
+       low[node] = l;
+    }
+  if (low[node] == myidx)
+    {
+      if (myidx != trj->firstidx)
+       myidx = -1;
+      for (i = stackstart; i < trj->nstack; i++)
+       low[low[i]] = myidx;
+      trj->nstack = stackstart;
+    }
+}
+
+
+void
+solver_get_unneeded(Solver *solv, Queue *unneededq, int filtered)
+{
+  Repo *installed = solv->installed;
+  int i;
+  Map cleandepsmap;
+
+  queue_empty(unneededq);
+  if (!installed || installed->end == installed->start)
+    return;
+
+  map_init(&cleandepsmap, installed->end - installed->start);
+  solver_createcleandepsmap(solv, &cleandepsmap, 1);
+  for (i = installed->start; i < installed->end; i++)
+    if (MAPTST(&cleandepsmap, i - installed->start))
+      queue_push(unneededq, i);
+
+  if (filtered && unneededq->count > 1)
+    {
+      Pool *pool = solv->pool;
+      Queue edges;
+      Id *nrequires;
+      Map installedm;
+      int j, pass, count = unneededq->count;
+      Id *low;
+
+      map_init(&installedm, pool->nsolvables);
+      for (i = installed->start; i < installed->end; i++)
+       if (pool->solvables[i].repo == installed)
+         MAPSET(&installedm, i);
+
+      nrequires = solv_calloc(count, sizeof(Id));
+      queue_init(&edges);
+      queue_prealloc(&edges, count * 4 + 10);  /* pre-size */
+
+      /*
+       * Go through the solvables in the nodes queue and create edges for
+       * all requires/recommends/supplements between the nodes.
+       * The edges are stored in the edges queue, we add 1 to the node
+       * index so that nodes in the edges queue are != 0 and we can
+       * terminate the edge list with 0.
+       * Thus for node element 5, the edges are stored starting at
+       * edges.elements[6] and are 0-terminated.
+       */
+      /* leave first element zero to make things easier */
+      /* also add trailing zero */
+      queue_insertn(&edges, 0, 1 + count + 1);
+
+      /* first requires and recommends */
+      for (i = 0; i < count; i++)
+       {
+         Solvable *s = pool->solvables + unneededq->elements[i];
+         edges.elements[i + 1] = edges.count;
+         for (pass = 0; pass < 2; pass++)
+           {
+             int num = 0;
+             unsigned int off = pass == 0 ? s->requires : s->recommends;
+             Id p, pp, *dp;
+             if (off)
+               for (dp = s->repo->idarraydata + off; *dp; dp++)
+                 FOR_PROVIDES(p, pp, *dp)
+                   {
+                     Solvable *sp = pool->solvables + p;
+                     if (s == sp || sp->repo != installed || !MAPTST(&cleandepsmap, p - installed->start))
+                       continue;
+                     for (j = 0; j < count; j++)
+                       if (p == unneededq->elements[j])
+                         break;
+                     if (j == count)
+                       continue;
+                     if (num && edges.elements[edges.count - 1] == j + 1)
+                       continue;
+                     queue_push(&edges, j + 1);
+                     num++;
+                   }
+               if (pass == 0)
+                 nrequires[i] = num;
+           }
+         queue_push(&edges, 0);
+       }
+#if 0
+      printf("requires + recommends\n");
+      for (i = 0; i < count; i++)
+       {
+         int j;
+         printf("  %s (%d requires):\n", pool_solvid2str(pool, unneededq->elements[i]), nrequires[i]);
+         for (j = edges.elements[i + 1]; edges.elements[j]; j++)
+           printf("    - %s\n", pool_solvid2str(pool, unneededq->elements[edges.elements[j] - 1]));
+       }
+#endif
+
+      /* then add supplements */
+      for (i = 0; i < count; i++)
+       {
+         Solvable *s = pool->solvables + unneededq->elements[i];
+         if (s->supplements)
+           {
+             Id *dp;
+             int k;
+             for (dp = s->repo->idarraydata + s->supplements; *dp; dp++)
+               if (dep_possible(solv, *dp, &installedm))
+                 {
+                   Queue iq;
+                   Id iqbuf[16];
+                   queue_init_buffer(&iq, iqbuf, sizeof(iqbuf)/sizeof(*iqbuf));
+                   dep_pkgcheck(solv, *dp, 0, &iq);
+                   for (k = 0; k < iq.count; k++)
+                     {
+                       Id p = iq.elements[k];
+                       Solvable *sp = pool->solvables + p;
+                       if (p == unneededq->elements[i] || sp->repo != installed || !MAPTST(&cleandepsmap, p - installed->start))
+                         continue;
+                       for (j = 0; j < count; j++)
+                         if (p == unneededq->elements[j])
+                           break;
+                       /* now add edge from j + 1 to i + 1 */
+                       queue_insert(&edges, edges.elements[j + 1] + nrequires[j], i + 1);
+                       /* addapt following edge pointers */
+                       for (k = j + 2; k < count + 2; k++)
+                         edges.elements[k]++;
+                     }
+                   queue_free(&iq);
+                 }
+           }
+       }
+#if 0
+      /* print result */
+      printf("+ supplements\n");
+      for (i = 0; i < count; i++)
+       {
+         int j;
+         printf("  %s (%d requires):\n", pool_solvid2str(pool, unneededq->elements[i]), nrequires[i]);
+         for (j = edges.elements[i + 1]; edges.elements[j]; j++)
+           printf("    - %s\n", pool_solvid2str(pool, unneededq->elements[edges.elements[j] - 1]));
+    }
+#endif
+      map_free(&installedm);
+
+      /* now run SCC algo two times, first with requires+recommends+supplements,
+       * then again without the requires. We run it the second time to get rid
+       * of packages that got dragged in via recommends/supplements */
+      /*
+       * low will contain the result of the SCC search.
+       * it must be of at least size 2 * (count + 1) and
+       * must be zero initialized.
+       * The layout is:
+       *    0  low low ... low stack stack ...stack 0
+       *            count              count
+       */
+      low = solv_calloc(count + 1, 2 * sizeof(Id));
+      for (pass = 0; pass < 2; pass++)
+       {
+         struct trj_data trj;
+         if (pass)
+           {
+             memset(low, 0, (count + 1) * (2 * sizeof(Id)));
+             for (i = 0; i < count; i++)
+               {
+                 edges.elements[i + 1] += nrequires[i];
+                 if (!unneededq->elements[i])
+                   low[i + 1] = -1;    /* ignore this node */
+               }
+           }
+         trj.edges = &edges;
+         trj.low = low;
+         trj.idx = count + 1;  /* stack starts here */
+         for (i = 1; i <= count; i++)
+           {
+             if (low[i])
+               continue;
+             if (edges.elements[edges.elements[i]])
+               {
+                 trj.firstidx = trj.nstack = trj.idx;
+                 trj_visit(&trj, i);
+               }
+             else
+               {
+                 Id myidx = trj.idx++;
+                 low[i] = myidx;
+                 low[myidx] = i;
+               }
+           }
+         /* prune packages */
+         for (i = 0; i < count; i++)
+           if (low[i + 1] <= 0)
+             unneededq->elements[i] = 0;
+       }
+      solv_free(low);
+      solv_free(nrequires);
+      queue_free(&edges);
+
+      /* finally remove all pruned entries from unneededq */
+      for (i = j = 0; i < count; i++)
+       if (unneededq->elements[i])
+         unneededq->elements[j++] = unneededq->elements[i];
+      queue_truncate(unneededq, j);
+    }
+  map_free(&cleandepsmap);
+}
+
 /* EOF */