do not count problem resolution install jobs as userinstalled
[platform/upstream/libsolv.git] / src / solver.c
index f5a7324..f188e3d 100644 (file)
@@ -25,6 +25,8 @@
 #include "policy.h"
 #include "poolarch.h"
 #include "solverdebug.h"
+#include "cplxdeps.h"
+#include "linkedpkg.h"
 
 #define RULES_BLOCK 63
 
@@ -58,7 +60,18 @@ solver_splitprovides(Solver *solv, Id dep)
   rd = GETRELDEP(pool, dep);
   if (rd->flags != REL_WITH)
     return 0;
-  FOR_PROVIDES(p, pp, dep)
+  /*
+   * things are a bit tricky here if pool->addedprovides == 1, because most split-provides are in
+   * a non-standard location. If we simply call pool_whatprovides, we'll drag in the complete
+   * file list. Instead we rely on pool_addfileprovides ignoring the addfileprovidesfiltered flag
+   * for installed packages and check the lazywhatprovidesq (ignoring the REL_WITH part, but
+   * we filter the package name further down anyway).
+   */
+  if (pool->addedfileprovides == 1 && !ISRELDEP(rd->evr) && !pool->whatprovides[rd->evr])
+    pp = pool_searchlazywhatprovidesq(pool, rd->evr);
+  else
+    pp = pool_whatprovides(pool, dep);
+  while ((p = pool->whatprovidesdata[pp++]) != 0)
     {
       /* here we have packages that provide the correct name and contain the path,
        * now do extra filtering */
@@ -227,7 +240,7 @@ autouninstall(Solver *solv, Id *problem)
 /************************************************************************/
 
 /*
- * enable/disable learnt rules 
+ * enable/disable learnt rules
  *
  * we have enabled or disabled some of our rules. We now reenable all
  * of our learnt rules except the ones that were learnt from rules that
@@ -276,7 +289,7 @@ enabledisablelearntrules(Solver *solv)
 
 /*
  * make assertion rules into decisions
- * 
+ *
  * Go through rules and add direct assertions to the decisionqueue.
  * If we find a conflict, disable rules and add them to problem queue.
  */
@@ -316,7 +329,7 @@ makeruledecisions(Solver *solv)
        {
          ri = solv->ruleassertions.elements[ii];
          r = solv->rules + ri;
-           
+
           if (havedisabled && ri >= solv->learntrules)
            {
              /* just started with learnt rule assertions. If we have disabled
@@ -324,7 +337,7 @@ makeruledecisions(Solver *solv)
              enabledisablelearntrules(solv);
              havedisabled = 0;
            }
-           
+
          if (r->d < 0 || !r->p || r->w2)       /* disabled, dummy or no assertion */
            continue;
 
@@ -334,7 +347,7 @@ makeruledecisions(Solver *solv)
 
          v = r->p;
          vv = v > 0 ? v : -v;
-           
+
          if (!solv->decisionmap[vv])          /* if not yet decided */
            {
              queue_push(&solv->decisionq, v);
@@ -356,15 +369,15 @@ makeruledecisions(Solver *solv)
            continue;
          if (v < 0 && solv->decisionmap[vv] < 0)    /* ok to remove */
            continue;
-           
+
          /*
           * found a conflict!
-          * 
+          *
           * The rule (r) we're currently processing says something
           * different (v = r->p) than a previous decision (decisionmap[abs(v)])
           * on this literal
           */
-           
+
          if (ri >= solv->learntrules)
            {
              /* conflict with a learnt rule */
@@ -374,7 +387,7 @@ makeruledecisions(Solver *solv)
              solver_disablerule(solv, r);
              continue;
            }
-           
+
          /*
           * find the decision which is the "opposite" of the rule
           */
@@ -383,7 +396,7 @@ makeruledecisions(Solver *solv)
              break;
          assert(i < solv->decisionq.count);         /* assert that we found it */
          oldproblemcount = solv->problems.count;
-           
+
          /*
           * conflict with system solvable ?
           */
@@ -445,7 +458,7 @@ makeruledecisions(Solver *solv)
          /*
           * conflict with another job or update/feature rule
           */
-           
+
          /* record proof */
          if (record_proof)
            {
@@ -529,7 +542,7 @@ makeruledecisions(Solver *solv)
            continue;
          if (v < 0 && solv->decisionmap[vv] < 0)
            continue;
-           
+
          POOL_DEBUG(SOLV_DEBUG_UNSOLVABLE, "assertion conflict, but I am weak, disabling ");
          solver_printrule(solv, SOLV_DEBUG_UNSOLVABLE, r);
 
@@ -593,7 +606,7 @@ makewatches(Solver *solv)
  *
  * add watches (for a new learned rule)
  * sets up watches for a single rule
- * 
+ *
  * see also makewatches() above.
  */
 
@@ -624,14 +637,14 @@ addwatches_rule(Solver *solv, Rule *r)
 #define DECISIONMAP_UNDEF(p) (decisionmap[(p) > 0 ? (p) : -(p)] == 0)
 
 /*-------------------------------------------------------------------
- * 
+ *
  * propagate
  *
  * make decision and propagate to all rules
- * 
+ *
  * Evaluate each term affected by the decision (linked through watches).
  * If we find unit rules we make new decisions based on them.
- * 
+ *
  * return : 0 = everything is OK
  *          rule = conflict found in this rule
  */
@@ -645,7 +658,7 @@ propagate(Solver *solv, int level)
   Id p, pkg, other_watch;
   Id *dp;
   Id *decisionmap = solv->decisionmap;
-    
+
   Id *watches = solv->watches + pool->nsolvables;   /* place ptr in middle */
 
   POOL_DEBUG(SOLV_DEBUG_PROPAGATE, "----- propagate -----\n");
@@ -686,7 +699,7 @@ propagate(Solver *solv, int level)
            }
 
            /* 'pkg' was just decided (was set to FALSE)
-            * 
+            *
             *  now find other literal watch, check clause
             *   and advance on linked list
             */
@@ -700,8 +713,8 @@ propagate(Solver *solv, int level)
              other_watch = r->w1;
              next_rp = &r->n2;
            }
-           
-           /* 
+
+           /*
             * This term is already true (through the other literal)
             * so we have nothing to do
             */
@@ -710,17 +723,17 @@ propagate(Solver *solv, int level)
 
            /*
             * The other literal is FALSE or UNDEF
-            * 
+            *
             */
-           
+
           if (r->d)
            {
              /* Not a binary clause, try to move our watch.
-              * 
+              *
               * Go over all literals and find one that is
               *   not other_watch
               *   and not FALSE
-              * 
+              *
               * (TRUE is also ok, in that case the rule is fulfilled)
               */
              if (r->p                                /* we have a 'p' */
@@ -755,10 +768,10 @@ propagate(Solver *solv, int level)
                      else
                        POOL_DEBUG(SOLV_DEBUG_PROPAGATE,"    -> move w%d to !%s\n", (pkg == r->w1 ? 1 : 2), pool_solvid2str(pool, -p));
                    }
-                   
+
                  *rp = *next_rp;
                  next_rp = rp;
-                   
+
                  if (pkg == r->w1)
                    {
                      r->w1 = p;
@@ -775,17 +788,17 @@ propagate(Solver *solv, int level)
              /* search failed, thus all unwatched literals are FALSE */
                
            } /* not binary */
-           
+
           /*
           * unit clause found, set literal other_watch to TRUE
           */
 
          if (DECISIONMAP_FALSE(other_watch))      /* check if literal is FALSE */
            return r;                              /* eek, a conflict! */
-           
+
          IF_POOLDEBUG (SOLV_DEBUG_PROPAGATE)
            {
-             POOL_DEBUG(SOLV_DEBUG_PROPAGATE, "   unit ");
+             POOL_DEBUG(SOLV_DEBUG_PROPAGATE, "  unit ");
              solver_printrule(solv, SOLV_DEBUG_PROPAGATE, r);
            }
 
@@ -793,7 +806,7 @@ propagate(Solver *solv, int level)
             decisionmap[other_watch] = level;    /* install! */
          else
            decisionmap[-other_watch] = -level;  /* remove! */
-           
+
          queue_push(&solv->decisionq, other_watch);
          queue_push(&solv->decisionq_why, r - solv->rules);
 
@@ -804,11 +817,11 @@ propagate(Solver *solv, int level)
              else
                POOL_DEBUG(SOLV_DEBUG_PROPAGATE, "    -> decided to conflict %s\n", pool_solvid2str(pool, -other_watch));
            }
-           
+
        } /* foreach rule involving 'pkg' */
        
     } /* while we have non-decided decisions */
-    
+
   POOL_DEBUG(SOLV_DEBUG_PROPAGATE, "----- propagate end-----\n");
 
   return 0;    /* all is well */
@@ -819,7 +832,7 @@ propagate(Solver *solv, int level)
 /* Analysis */
 
 /*-------------------------------------------------------------------
- * 
+ *
  * analyze
  *   and learn
  */
@@ -946,9 +959,9 @@ l1retry:
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * solver_reset
- * 
+ *
  * reset all solver decisions
  * called after rules have been enabled/disabled
  */
@@ -970,6 +983,7 @@ solver_reset(Solver *solv)
   queue_empty(&solv->decisionq);
   solv->recommends_index = -1;
   solv->propagate_index = 0;
+  solv->decisioncnt_update = solv->decisioncnt_keep = solv->decisioncnt_resolve = solv->decisioncnt_weak = solv->decisioncnt_orphan = 0;
   queue_empty(&solv->branches);
 
   /* adapt learnt rule status to new set of enabled/disabled rules */
@@ -982,7 +996,7 @@ solver_reset(Solver *solv)
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * analyze_unsolvable_rule
  *
  * recursion helper used by analyze_unsolvable
@@ -1044,7 +1058,7 @@ analyze_unsolvable_rule(Solver *solv, Rule *r, Id *lastweakp, Map *rseen)
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * analyze_unsolvable
  *
  * We know that the problem is not solvable. Record all involved
@@ -1120,7 +1134,7 @@ analyze_unsolvable(Solver *solv, Rule *cr, int disablerules)
     {
       v = solv->decisionq.elements[--idx];
       vv = v > 0 ? v : -v;
-      if (!MAPTST(&seen, vv))
+      if (!MAPTST(&seen, vv) || vv == SYSTEMSOLVABLE)
        continue;
       why = solv->decisionq_why.elements[idx];
       assert(why > 0);
@@ -1206,7 +1220,7 @@ analyze_unsolvable(Solver *solv, Rule *cr, int disablerules)
 /* Decision revert */
 
 /*-------------------------------------------------------------------
- * 
+ *
  * revert
  * revert decisionq to a level
  */
@@ -1234,12 +1248,23 @@ revert(Solver *solv, int level)
       while (solv->branches.count && solv->branches.elements[solv->branches.count - 1] >= 0)
        solv->branches.count--;
     }
-  solv->recommends_index = -1;
+  if (solv->recommends_index > solv->decisionq.count)
+    solv->recommends_index = -1;       /* rebuild recommends/suggests maps */
+  if (solv->decisionq.count < solv->decisioncnt_update)
+    solv->decisioncnt_update = 0;
+  if (solv->decisionq.count < solv->decisioncnt_keep)
+    solv->decisioncnt_keep = 0;
+  if (solv->decisionq.count < solv->decisioncnt_resolve)
+    solv->decisioncnt_resolve = 0;
+  if (solv->decisionq.count < solv->decisioncnt_weak)
+    solv->decisioncnt_weak= 0;
+  if (solv->decisionq.count < solv->decisioncnt_orphan)
+    solv->decisioncnt_orphan = 0;
 }
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * watch2onhighest - put watch2 on literal with highest level
  */
 
@@ -1268,7 +1293,7 @@ watch2onhighest(Solver *solv, Rule *r)
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * setpropagatelearn
  *
  * add free decision (solvable to install) to decisionq
@@ -1345,11 +1370,54 @@ setpropagatelearn(Solver *solv, int level, Id decision, int disablerules, Id rul
   return level;
 }
 
+static void
+reorder_dq_for_jobrules(Solver *solv, int level, Queue *dq)
+{
+  Pool *pool = solv->pool;
+  int i, j, haveone = 0, dqcount = dq->count;
+  Id p;
+  Solvable *s;
+
+  /* at the time we process jobrules the installed packages are not kept yet */
+  /* reorder so that "future-supplemented" packages come first */
+  FOR_REPO_SOLVABLES(solv->installed, p, s)
+    {
+      if (MAPTST(&solv->noupdate, p - solv->installed->start))
+       continue;
+      if (solv->decisionmap[p] == 0)
+       {
+         solv->decisionmap[p] = level;
+         haveone = 1;
+       }
+    }
+  if (!haveone)
+    return;
+  for (i = 0; i < dqcount; i++)
+    if (!solver_is_enhancing(solv, pool->solvables + dq->elements[i]))
+      {
+       queue_push(dq, dq->elements[i]);
+       dq->elements[i] = 0;
+      }
+  dqcount = dq->count;
+  for (i = 0; i < dqcount; i++)
+    if (dq->elements[i] && !solver_is_supplementing(solv, pool->solvables + dq->elements[i]))
+      {
+       queue_push(dq, dq->elements[i]);
+       dq->elements[i] = 0;
+      }
+  for (i = j = 0; i < dq->count; i++)
+    if (dq->elements[i])
+      dq->elements[j++] = dq->elements[i];
+  queue_truncate(dq, j);
+  FOR_REPO_SOLVABLES(solv->installed, p, s)
+    if (solv->decisionmap[p] == level)
+      solv->decisionmap[p] = 0;
+}
 
 /*-------------------------------------------------------------------
- * 
+ *
  * select and install
- * 
+ *
  * install best package from the queue. We add an extra package, inst, if
  * provided. See comment in weak install section.
  *
@@ -1380,6 +1448,8 @@ selectandinstall(Solver *solv, int level, Queue *dq, int disablerules, Id ruleid
            break;
          }
     }
+  if (dq->count > 1 && ruleid >= solv->jobrules && ruleid < solv->jobrules_end && solv->installed)
+    reorder_dq_for_jobrules(solv, level, dq);
   if (dq->count > 1)
     {
       /* multiple candidates, open a branch */
@@ -1400,7 +1470,7 @@ selectandinstall(Solver *solv, int level, Queue *dq, int disablerules, Id ruleid
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * solver_create
  * create solver structure
  *
@@ -1427,6 +1497,8 @@ solver_create(Pool *pool)
   solv->dup_allowarchchange = 1;
   solv->dup_allowvendorchange = 1;
 
+  solv->keepexplicitobsoletes = pool->noobsoletesmultiversion ? 0 : 1;
+
   queue_init(&solv->ruletojob);
   queue_init(&solv->decisionq);
   queue_init(&solv->decisionq_why);
@@ -1456,10 +1528,29 @@ solver_create(Pool *pool)
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * solver_free
  */
 
+static inline void
+queuep_free(Queue **qp)
+{
+  if (!*qp)
+    return;
+  queue_free(*qp);
+  *qp = solv_free(*qp);
+}
+
+static inline void
+map_zerosize(Map *m)
+{
+  if (m->size)
+    {
+      map_free(m);
+      map_init(m, 0);
+    }
+}
+
 void
 solver_free(Solver *solv)
 {
@@ -1476,26 +1567,12 @@ solver_free(Solver *solv)
   queue_free(&solv->weakruleq);
   queue_free(&solv->ruleassertions);
   queue_free(&solv->addedmap_deduceq);
-  if (solv->cleandeps_updatepkgs)
-    {
-      queue_free(solv->cleandeps_updatepkgs);
-      solv->cleandeps_updatepkgs = solv_free(solv->cleandeps_updatepkgs);
-    }
-  if (solv->cleandeps_mistakes)
-    {
-      queue_free(solv->cleandeps_mistakes);
-      solv->cleandeps_mistakes = solv_free(solv->cleandeps_mistakes);
-    }
-  if (solv->update_targets)
-    {
-      queue_free(solv->update_targets);
-      solv->update_targets = solv_free(solv->update_targets);
-    }
-  if (solv->installsuppdepq)
-    {
-      queue_free(solv->installsuppdepq);
-      solv->installsuppdepq = solv_free(solv->installsuppdepq);
-    }
+  queuep_free(&solv->cleandeps_updatepkgs);
+  queuep_free(&solv->cleandeps_mistakes);
+  queuep_free(&solv->update_targets);
+  queuep_free(&solv->installsuppdepq);
+  queuep_free(&solv->recommendscplxq);
+  queuep_free(&solv->suggestscplxq);
 
   map_free(&solv->recommendsmap);
   map_free(&solv->suggestsmap);
@@ -1516,9 +1593,10 @@ solver_free(Solver *solv)
   solv_free(solv->watches);
   solv_free(solv->obsoletes);
   solv_free(solv->obsoletes_data);
-  solv_free(solv->multiversionupdaters);
+  solv_free(solv->specialupdaters);
   solv_free(solv->choicerules_ref);
   solv_free(solv->bestrules_pkg);
+  solv_free(solv->instbuddy);
   solv_free(solv);
 }
 
@@ -1553,6 +1631,14 @@ solver_get_flag(Solver *solv, int flag)
     return solv->bestobeypolicy;
   case SOLVER_FLAG_NO_AUTOTARGET:
     return solv->noautotarget;
+  case SOLVER_FLAG_DUP_ALLOW_DOWNGRADE:
+    return solv->dup_allowdowngrade;
+  case SOLVER_FLAG_DUP_ALLOW_NAMECHANGE:
+    return solv->dup_allownamechange;
+  case SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE:
+    return solv->dup_allowarchchange;
+  case SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE:
+    return solv->dup_allowvendorchange;
   default:
     break;
   }
@@ -1604,6 +1690,18 @@ solver_set_flag(Solver *solv, int flag, int value)
   case SOLVER_FLAG_NO_AUTOTARGET:
     solv->noautotarget = value;
     break;
+  case SOLVER_FLAG_DUP_ALLOW_DOWNGRADE:
+    solv->dup_allowdowngrade = value;
+    break;
+  case SOLVER_FLAG_DUP_ALLOW_NAMECHANGE:
+    solv->dup_allownamechange = value;
+    break;
+  case SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE:
+    solv->dup_allowarchchange = value;
+    break;
+  case SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE:
+    solv->dup_allowvendorchange = value;
+    break;
   default:
     break;
   }
@@ -1680,8 +1778,140 @@ prune_to_update_targets(Solver *solv, Id *cp, Queue *q)
   queue_truncate(q, j);
 }
 
+#ifdef ENABLE_COMPLEX_DEPS
+
+static void
+add_complex_recommends(Solver *solv, Id rec, Queue *dq, Map *dqmap)
+{
+  Pool *pool = solv->pool;
+  int oldcnt = dq->count;
+  int cutcnt, blkcnt;
+  Id p;
+  int i, j;
+
+#if 0
+  printf("ADD_COMPLEX_RECOMMENDS %s\n", pool_dep2str(pool, rec));
+#endif
+  i = pool_normalize_complex_dep(pool, rec, dq, CPLXDEPS_EXPAND);
+  if (i == 0 || i == 1)
+    return;
+  cutcnt = dq->count;
+  for (i = oldcnt; i < cutcnt; i++)
+    {
+      blkcnt = dq->count;
+      for (; (p = dq->elements[i]) != 0; i++)
+       {
+         if (p < 0)
+           {
+             if (solv->decisionmap[-p] <= 0)
+               break;
+             continue;
+           }
+         if (solv->decisionmap[p] > 0)
+           {
+             queue_truncate(dq, blkcnt);
+             break;
+           }
+         if (dqmap)
+           {
+             if (!MAPTST(dqmap, p))
+               continue;
+           }
+         else
+           {
+             if (solv->decisionmap[p] < 0)
+               continue;
+             if (solv->dupmap_all && solv->installed && pool->solvables[p].repo == solv->installed && (solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, p - solv->installed->start))))
+               continue;
+           }
+         queue_push(dq, p);
+       }
+      while (dq->elements[i])
+       i++;
+    }
+  queue_deleten(dq, oldcnt, cutcnt - oldcnt);
+  /* unify */
+  if (dq->count != oldcnt)
+    {
+      for (j = oldcnt; j < dq->count; j++)
+       {
+         p = dq->elements[j];
+         for (i = 0; i < j; i++)
+           if (dq->elements[i] == p)
+             {
+               dq->elements[j] = 0;
+               break;
+             }
+       }
+      for (i = j = oldcnt; j < dq->count; j++)
+       if (dq->elements[j])
+         dq->elements[i++] = dq->elements[j];
+      queue_truncate(dq, i);
+    }
+#if 0
+  printf("RETURN:\n");
+  for (i = oldcnt; i < dq->count; i++)
+    printf("  - %s\n", pool_solvid2str(pool, dq->elements[i]));
+#endif
+}
+
+static void
+do_complex_recommendations(Solver *solv, Id rec, Map *m, int noselected)
+{
+  Pool *pool = solv->pool;
+  Queue dq;
+  Id p;
+  int i, blk;
+
+#if 0
+  printf("DO_COMPLEX_RECOMMENDATIONS %s\n", pool_dep2str(pool, rec));
+#endif
+  queue_init(&dq);
+  i = pool_normalize_complex_dep(pool, rec, &dq, CPLXDEPS_EXPAND);
+  if (i == 0 || i == 1)
+    {
+      queue_free(&dq);
+      return;
+    }
+  for (i = 0; i < dq.count; i++)
+    {
+      blk = i;
+      for (; (p = dq.elements[i]) != 0; i++)
+       {
+         if (p < 0)
+           {
+             if (solv->decisionmap[-p] <= 0)
+               break;
+             continue;
+           }
+         if (solv->decisionmap[p] > 0)
+           {
+             if (noselected)
+               break;
+             MAPSET(m, p);
+             for (i++; (p = dq.elements[i]) != 0; i++)
+               if (p > 0 && solv->decisionmap[p] > 0)
+                 MAPSET(m, p);
+             p = 1;
+             break;
+           }
+       }
+      if (!p)
+       {
+         for (i = blk; (p = dq.elements[i]) != 0; i++)
+           if (p > 0)
+             MAPSET(m, p);
+       }
+      while (dq.elements[i])
+       i++;
+    }
+  queue_free(&dq);
+}
+
+#endif
+
 /*-------------------------------------------------------------------
- * 
+ *
  * solver_run_sat
  *
  * all rules have been set up, now actually run the solver
@@ -1731,7 +1961,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
    * if we encounter a problem, we rewind to a safe level and restart
    * with step 1
    */
-   
+
   minimizationsteps = 0;
   for (;;)
     {
@@ -1812,8 +2042,8 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
          systemlevel = level + 1;
          if (i < solv->jobrules_end)
            continue;
-          solv->decisioncnt_update = solv->decisionq.count;
-          solv->decisioncnt_keep = solv->decisionq.count;
+          if (!solv->decisioncnt_update)
+            solv->decisioncnt_update = solv->decisionq.count;
        }
 
       /*
@@ -1825,14 +2055,15 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
          int pass;
 
          POOL_DEBUG(SOLV_DEBUG_SOLVER, "resolving installed packages\n");
-         /* we use two passes if we need to update packages 
+         /* we use two passes if we need to update packages
            * to create a better user experience */
          for (pass = solv->updatemap.size ? 0 : 1; pass < 2; pass++)
            {
              int passlevel = level;
-             if (pass == 1)
+             Id *specialupdaters = solv->specialupdaters;
+             if (pass == 1 && !solv->decisioncnt_keep)
                solv->decisioncnt_keep = solv->decisionq.count;
-             /* start with installedpos, the position that gave us problems last time */
+             /* start with installedpos, the position that gave us problems the last time */
              for (i = installedpos, n = installed->start; n < installed->end; i++, n++)
                {
                  Rule *rr;
@@ -1844,8 +2075,8 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                  if (s->repo != installed)
                    continue;
 
-                 if (solv->decisionmap[i] > 0)
-                   continue;
+                 if (solv->decisionmap[i] > 0 && (!specialupdaters || !specialupdaters[i - installed->start]))
+                   continue;           /* already decided */
                  if (!pass && solv->updatemap.size && !MAPTST(&solv->updatemap, i - installed->start))
                    continue;           /* updates first */
                  r = solv->rules + solv->updaterules + (i - installed->start);
@@ -1854,21 +2085,35 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                    rr -= solv->installed->end - solv->installed->start;
                  if (!rr->p)           /* identical to update rule? */
                    rr = r;
-                 if (!rr->p)
+                 if (!rr->p && !(specialupdaters && specialupdaters[i - installed->start]))
                    continue;           /* orpaned package */
 
-                 /* XXX: noupdate check is probably no longer needed, as all jobs should
-                  * already be satisfied */
-                 /* Actually we currently still need it because of erase jobs */
-                 /* if noupdate is set we do not look at update candidates */
+                 /* check if we should update this package to the latest version
+                  * noupdate is set for erase jobs, in that case we want to deinstall
+                  * the installed package and not replace it with a newer version
+                  * rr->p != i is for dup jobs where the installed package cannot be kept */
                  queue_empty(&dq);
-                 if (!MAPTST(&solv->noupdate, i - installed->start) && (solv->decisionmap[i] < 0 || solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, i - installed->start)) || rr->p != i))
+                 if (!MAPTST(&solv->noupdate, i - installed->start) && (solv->decisionmap[i] < 0 || solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, i - installed->start)) || (rr->p && rr->p != i)))
                    {
-                     if (solv->multiversion.size && solv->multiversionupdaters
-                            && (d = solv->multiversionupdaters[i - installed->start]) != 0)
+                     if (!rr->p)
+                       {
+                         /* specialupdater with no update/feature rule */
+                         for (d = specialupdaters[i - installed->start]; (p = pool->whatprovidesdata[d++]) != 0; )
+                           {
+                             if (solv->decisionmap[p] > 0)
+                               {
+                                 dq.count = 0;
+                                 break;
+                               }
+                             if (!solv->decisionmap[p])
+                               queue_push(&dq, p);
+                           }
+                       }
+                     else if (specialupdaters && (d = specialupdaters[i - installed->start]) != 0)
                        {
                          /* special multiversion handling, make sure best version is chosen */
-                         queue_push(&dq, i);
+                         if (rr->p == i && solv->decisionmap[i] >= 0)
+                           queue_push(&dq, i);
                          while ((p = pool->whatprovidesdata[d++]) != 0)
                            if (solv->decisionmap[p] >= 0)
                              queue_push(&dq, p);
@@ -1891,7 +2136,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                        }
                      else
                        {
-                         /* update to best package */
+                         /* update to best package of the update rule */
                          FOR_RULELITERALS(p, pp, rr)
                            {
                              if (solv->decisionmap[p] > 0)
@@ -1973,6 +2218,8 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
          if (pass < 2)
            continue;           /* had trouble, retry */
        }
+      if (!solv->decisioncnt_keep)
+       solv->decisioncnt_keep = solv->decisionq.count;
 
       if (level < systemlevel)
         systemlevel = level;
@@ -1980,7 +2227,8 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
       /*
        * decide
        */
-      solv->decisioncnt_resolve = solv->decisionq.count;
+      if (!solv->decisioncnt_resolve)
+        solv->decisioncnt_resolve = solv->decisionq.count;
       POOL_DEBUG(SOLV_DEBUG_POLICY, "deciding unresolved rules\n");
       for (i = 1, n = 1; n < solv->nrules; i++, n++)
        {
@@ -1989,12 +2237,18 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
          r = solv->rules + i;
          if (r->d < 0)         /* ignore disabled rules */
            continue;
-         queue_empty(&dq);
+         if (r->p < 0)         /* most common cases first */
+           {
+             if (r->d == 0 || solv->decisionmap[-r->p] <= 0)
+               continue;
+           }
+         if (dq.count)
+           queue_empty(&dq);
          if (r->d == 0)
            {
              /* binary or unary rule */
-             /* need two positive undecided literals */
-             if (r->p < 0 || r->w2 <= 0)
+             /* need two positive undecided literals, r->p already checked above */
+             if (r->w2 <= 0)
                continue;
              if (solv->decisionmap[r->p] || solv->decisionmap[r->w2])
                continue;
@@ -2008,13 +2262,9 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                * no positive literal is installed
               * i.e. the rule is not fulfilled and we
                * just need to decide on the positive literals
+              * (decisionmap[-r->p] for the r->p < 0 case is already checked above)
                */
-             if (r->p < 0)
-               {
-                 if (solv->decisionmap[-r->p] <= 0)
-                   continue;
-               }
-             else
+             if (r->p >= 0)
                {
                  if (solv->decisionmap[r->p] > 0)
                    continue;
@@ -2080,9 +2330,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
          continue;             /* start over */
        }
 
-      /* at this point we have a consistent system. now do the extras... */
-
-      /* first decide leftover cleandeps packages */
+      /* decide leftover cleandeps packages */
       if (solv->cleandepsmap.size && solv->installed)
        {
          for (p = solv->installed->start; p < solv->installed->end; p++)
@@ -2103,7 +2351,10 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
            continue;
        }
 
-      solv->decisioncnt_weak = solv->decisionq.count;
+      /* at this point we have a consistent system. now do the extras... */
+
+      if (!solv->decisioncnt_weak)
+        solv->decisioncnt_weak = solv->decisionq.count;
       if (doweak)
        {
          int qcount;
@@ -2128,6 +2379,13 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                      recp = s->repo->idarraydata + s->recommends;
                      while ((rec = *recp++) != 0)
                        {
+#ifdef ENABLE_COMPLEX_DEPS
+                         if (pool_is_complex_dep(pool, rec))
+                           {
+                             add_complex_recommends(solv, rec, &dq, 0);
+                             continue;
+                           }
+#endif
                          qcount = dq.count;
                          FOR_PROVIDES(p, pp, rec)
                            {
@@ -2331,6 +2589,11 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                  while ((rec = *recp++) != 0)
                    {
                      queue_empty(&dq);
+#ifdef ENABLE_COMPLEX_DEPS
+                     if (pool_is_complex_dep(pool, rec))
+                         add_complex_recommends(solv, rec, &dq, &dqmap);
+                     else
+#endif
                      FOR_PROVIDES(p, pp, rec)
                        {
                          if (solv->decisionmap[p] > 0)
@@ -2339,7 +2602,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                              break;
                            }
                          else if (solv->decisionmap[p] == 0 && MAPTST(&dqmap, p))
-                           queue_pushunique(&dq, p);
+                           queue_push(&dq, p);
                        }
                      if (!dq.count)
                        continue;
@@ -2367,7 +2630,8 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
            }
        }
 
-      solv->decisioncnt_orphan = solv->decisionq.count;
+      if (!solv->decisioncnt_orphan)
+        solv->decisioncnt_orphan = solv->decisionq.count;
       if (solv->dupmap_all && solv->installed)
        {
          int installedone = 0;
@@ -2415,7 +2679,31 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
            }
        }
 
-     if (solv->installed && solv->cleandepsmap.size)
+     /* one final pass to make sure we decided all installed packages */
+      if (solv->installed)
+       {
+         for (p = solv->installed->start; p < solv->installed->end; p++)
+           {
+             if (solv->decisionmap[p])
+               continue;       /* already decided */
+             s = pool->solvables + p;
+             if (s->repo != solv->installed)
+               continue;
+             POOL_DEBUG(SOLV_DEBUG_SOLVER, "removing unwanted %s\n", pool_solvid2str(pool, p));
+             olevel = level;
+             level = setpropagatelearn(solv, level, -p, 0, 0);
+             if (level < olevel)
+               break;
+           }
+         if (p < solv->installed->end)
+           {
+             if (level == 0)
+               break;
+             continue;         /* back to main loop */
+           }
+       }
+
+      if (solv->installed && solv->cleandepsmap.size)
        {
          if (cleandeps_check_mistakes(solv, level))
            {
@@ -2425,7 +2713,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
            }
        }
 
-     if (solv->solution_callback)
+      if (solv->solution_callback)
        {
          solv->solution_callback(solv, solv->solution_callback_data);
          if (solv->branches.count)
@@ -2461,7 +2749,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
        }
 
       /* auto-minimization step */
-     if (solv->branches.count)
+      if (solv->branches.count)
        {
          int l = 0, lasti = -1, lastl = -1;
          Id why;
@@ -2522,7 +2810,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * remove disabled conflicts
  *
  * purpose: update the decisionmap after some rules were disabled.
@@ -2767,7 +3055,7 @@ add_update_target(Solver *solv, Id p, Id how)
       Id obs, *obsp = s->repo->idarraydata + s->obsoletes;
       while ((obs = *obsp++) != 0)
        {
-         FOR_PROVIDES(pi, pip, obs) 
+         FOR_PROVIDES(pi, pip, obs)
            {
              Solvable *si = pool->solvables + pi;
              if (si->repo != installed)
@@ -2882,7 +3170,7 @@ addedmap2deduceq(Solver *solv, Map *addedmap)
       j++;
 }
 
-static void 
+static void
 deduceq2addedmap(Solver *solv, Map *addedmap)
 {
   int j;
@@ -2941,7 +3229,7 @@ solver_solve(Solver *solv, Queue *job)
   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);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "obsoleteusesprovides=%d, implicitobsoleteusesprovides=%d, obsoleteusescolors=%d, implicitobsoleteusescolors=%d\n", pool->obsoleteusesprovides, pool->implicitobsoleteusesprovides, pool->obsoleteusescolors, pool->implicitobsoleteusescolors);
   POOL_DEBUG(SOLV_DEBUG_STATS, "dontinstallrecommended=%d, addalreadyrecommended=%d\n", solv->dontinstallrecommended, solv->addalreadyrecommended);
 
   /* create whatprovides if not already there */
@@ -2959,68 +3247,28 @@ solver_solve(Solver *solv, Queue *job)
     queue_insertn(&solv->job, 0, pool->pooljobs.count, pool->pooljobs.elements);
   job = &solv->job;
 
-  /* free old stuff */
-  if (solv->update_targets)
-    {
-      queue_free(solv->update_targets);
-      solv->update_targets = solv_free(solv->update_targets);
-    }
-  if (solv->cleandeps_updatepkgs)
-    {
-      queue_free(solv->cleandeps_updatepkgs);
-      solv->cleandeps_updatepkgs = solv_free(solv->cleandeps_updatepkgs);
-    }
+  /* free old stuff in jase we re-run a solver */
+  queuep_free(&solv->update_targets);
+  queuep_free(&solv->cleandeps_updatepkgs);
   queue_empty(&solv->ruleassertions);
   solv->bestrules_pkg = solv_free(solv->bestrules_pkg);
   solv->choicerules_ref = solv_free(solv->choicerules_ref);
   if (solv->noupdate.size)
     map_empty(&solv->noupdate);
-  if (solv->multiversion.size)
-    {
-      map_free(&solv->multiversion);
-      map_init(&solv->multiversion, 0);
-    }
+  map_zerosize(&solv->multiversion);
   solv->updatemap_all = 0;
-  if (solv->updatemap.size)
-    {
-      map_free(&solv->updatemap);
-      map_init(&solv->updatemap, 0);
-    }
+  map_zerosize(&solv->updatemap);
   solv->bestupdatemap_all = 0;
-  if (solv->bestupdatemap.size)
-    {
-      map_free(&solv->bestupdatemap);
-      map_init(&solv->bestupdatemap, 0);
-    }
+  map_zerosize(&solv->bestupdatemap);
   solv->fixmap_all = 0;
-  if (solv->fixmap.size)
-    {
-      map_free(&solv->fixmap);
-      map_init(&solv->fixmap, 0);
-    }
+  map_zerosize(&solv->fixmap);
   solv->dupmap_all = 0;
-  if (solv->dupmap.size)
-    {
-      map_free(&solv->dupmap);
-      map_init(&solv->dupmap, 0);
-    }
-  if (solv->dupinvolvedmap.size)
-    {
-      map_free(&solv->dupinvolvedmap);
-      map_init(&solv->dupinvolvedmap, 0);
-    }
+  map_zerosize(&solv->dupmap);
+  map_zerosize(&solv->dupinvolvedmap);
   solv->droporphanedmap_all = 0;
-  if (solv->droporphanedmap.size)
-    {
-      map_free(&solv->droporphanedmap);
-      map_init(&solv->droporphanedmap, 0);
-    }
-  if (solv->cleandepsmap.size)
-    {
-      map_free(&solv->cleandepsmap);
-      map_init(&solv->cleandepsmap, 0);
-    }
-  
+  map_zerosize(&solv->droporphanedmap);
+  map_zerosize(&solv->cleandepsmap);
+  map_zerosize(&solv->weakrulemap);
   queue_empty(&solv->weakruleq);
   solv->watches = solv_free(solv->watches);
   queue_empty(&solv->ruletojob);
@@ -3041,10 +3289,12 @@ solver_solve(Solver *solv, Queue *job)
     {
       map_empty(&solv->recommendsmap);
       map_empty(&solv->suggestsmap);
+      queuep_free(&solv->recommendscplxq);
+      queuep_free(&solv->suggestscplxq);
       solv->recommends_index = 0;
     }
-  solv->multiversionupdaters = solv_free(solv->multiversionupdaters);
-  
+  solv->specialupdaters = solv_free(solv->specialupdaters);
+
 
   /*
    * create basic rule set of all involved packages
@@ -3073,7 +3323,7 @@ solver_solve(Solver *solv, Queue *job)
     solver_shrinkrules(solv, initialnrules);
   solv->nrules = initialnrules;
   solv->rpmrules_end = 0;
-  
+
   if (installed)
     {
       /* check for update/verify jobs as they need to be known early */
@@ -3184,7 +3434,7 @@ solver_solve(Solver *solv, Queue *job)
    * create rules for all packages involved in the job
    * (to be installed or removed)
    */
-    
+
   oldnrules = solv->nrules;
   for (i = 0; i < job->count; i += 2)
     {
@@ -3218,7 +3468,7 @@ solver_solve(Solver *solv, Queue *job)
     }
   POOL_DEBUG(SOLV_DEBUG_STATS, "added %d rpm rules for packages involved in a job\n", solv->nrules - oldnrules);
 
-    
+
   /*
    * add rules for suggests, enhances
    */
@@ -3226,6 +3476,12 @@ solver_solve(Solver *solv, Queue *job)
   solver_addrpmrulesforweak(solv, &addedmap);
   POOL_DEBUG(SOLV_DEBUG_STATS, "added %d rpm rules because of weak dependencies\n", solv->nrules - oldnrules);
 
+#ifdef ENABLE_LINKED_PKGS
+  oldnrules = solv->nrules;
+  solver_addrpmrulesforlinked(solv, &addedmap);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "added %d rpm rules because of linked packages\n", solv->nrules - oldnrules);
+#endif
+
   /*
    * first pass done, we now have all the rpm rules we need.
    * unify existing rules before going over all job rules and
@@ -3264,16 +3520,16 @@ solver_solve(Solver *solv, Queue *job)
 
   /*
    * create feature rules
-   * 
+   *
    * foreach installed:
    *   create assertion (keep installed, if no update available)
    *   or
    *   create update rule (A|update1(A)|update2(A)|...)
-   * 
+   *
    * those are used later on to keep a version of the installed packages in
    * best effort mode
    */
-    
+
   solv->featurerules = solv->nrules;              /* mark start of feature rules */
   if (installed)
     {
@@ -3294,11 +3550,11 @@ solver_solve(Solver *solv, Queue *job)
 
     /*
      * Add update rules for installed solvables
-     * 
+     *
      * almost identical to feature rules
      * except that downgrades/archchanges/vendorchanges are not allowed
      */
-    
+
   solv->updaterules = solv->nrules;
 
   if (installed)
@@ -3325,7 +3581,7 @@ solver_solve(Solver *solv, Queue *job)
            queue_push(&solv->orphaned, i);
           if (!r->p)
            {
-             assert(solv->dupmap_all && !sr->p);
+             /* assert(solv->dupmap_all && !sr->p); */
              continue;
            }
          if (!solver_rulecmp(solv, r, sr))
@@ -3372,7 +3628,9 @@ solver_solve(Solver *solv, Queue *job)
                queue_push(&q, p);
              if (!q.count)
                {
-                 /* no candidate found, make this an impossible rule */
+                 if (select == SOLVER_SOLVABLE_ONE_OF)
+                   break;      /* ignore empty installs */
+                 /* no candidate found or unsupported, make this an impossible rule */
                  queue_push(&q, -SYSTEMSOLVABLE);
                }
              p = queue_shift(&q);      /* get first candidate */
@@ -3534,13 +3792,15 @@ solver_solve(Solver *solv, Queue *job)
   if (!solv->noinfarchcheck)
     {
       solver_addinfarchrules(solv, &addedmap);
-      if (pool->obsoleteusescolors)
+#if 0
+      if (pool->implicitobsoleteusescolors)
        {
          /* currently doesn't work well with infarch rules, so make
            * them weak */
          for (i = solv->infarchrules; i < solv->infarchrules_end; i++)
            queue_push(&solv->weakruleq, i);
        }
+#endif
     }
   else
     solv->infarchrules = solv->infarchrules_end = solv->nrules;
@@ -3572,7 +3832,7 @@ solver_solve(Solver *solv, Queue *job)
    * --------------------------------------------------------------
    * prepare for solving
    */
-    
+
   /* free unneeded memory */
   map_free(&addedmap);
   map_free(&installcandidatemap);
@@ -3594,10 +3854,10 @@ solver_solve(Solver *solv, Queue *job)
     map_grow(&solv->cleandepsmap, installed->end - installed->start);
   /* no mistakes */
   if (solv->cleandeps_mistakes)
-    {    
+    {
       queue_free(solv->cleandeps_mistakes);
       solv->cleandeps_mistakes = solv_free(solv->cleandeps_mistakes);
-    }    
+    }
 
   /* all new rules are learnt after this point */
   solv->learntrules = solv->nrules;
@@ -3623,7 +3883,7 @@ solver_solve(Solver *solv, Queue *job)
    * solve!
    * ********************************************
    */
-    
+
   now = solv_timems(0);
   solver_run_sat(solv, 1, solv->dontinstallrecommended ? 0 : 1);
   POOL_DEBUG(SOLV_DEBUG_STATS, "solver took %d ms\n", solv_timems(now));
@@ -3699,7 +3959,7 @@ void solver_get_recommendations(Solver *solv, Queue *recommendationsq, Queue *su
       solver_disablerule(solv, r);
       goterase++;
     }
-  
+
   if (goterase)
     {
       enabledisablelearntrules(solv);
@@ -3726,7 +3986,7 @@ void solver_get_recommendations(Solver *solv, Queue *recommendationsq, Queue *su
              Id why;
              why = solv->decisionq_why.elements[i];
              if (why)
-               continue;       /* forced by unit rule */
+               continue;       /* forced by unit rule or dep resolving */
              p = solv->decisionq.elements[i];
              if (p < 0)
                continue;
@@ -3745,6 +4005,13 @@ void solver_get_recommendations(Solver *solv, Queue *recommendationsq, Queue *su
              recp = s->repo->idarraydata + s->recommends;
              while ((rec = *recp++) != 0)
                {
+#ifdef ENABLE_COMPLEX_DEPS
+                 if (pool_is_complex_dep(pool, rec))
+                   {
+                     do_complex_recommendations(solv, rec, &solv->recommendsmap, noselected);
+                     continue;
+                   }
+#endif
                  FOR_PROVIDES(p, pp, rec)
                    if (solv->decisionmap[p] > 0)
                      break;
@@ -3790,7 +4057,7 @@ void solver_get_recommendations(Solver *solv, Queue *recommendationsq, Queue *su
   /*
    * find suggested packages
    */
-    
+
   if (suggestionsq)
     {
       Id sug, *sugp, p, pp;
@@ -3810,6 +4077,13 @@ void solver_get_recommendations(Solver *solv, Queue *recommendationsq, Queue *su
              sugp = s->repo->idarraydata + s->suggests;
              while ((sug = *sugp++) != 0)
                {
+#ifdef ENABLE_COMPLEX_DEPS
+                 if (pool_is_complex_dep(pool, sug))
+                   {
+                     do_complex_recommendations(solv, sug, &solv->suggestsmap, noselected);
+                     continue;
+                   }
+#endif
                  FOR_PROVIDES(p, pp, sug)
                    if (solv->decisionmap[p] > 0)
                      break;
@@ -3855,7 +4129,7 @@ void solver_get_recommendations(Solver *solv, Queue *recommendationsq, Queue *su
   if (redoq.count)
     undo_removedisabledconflicts(solv, &redoq);
   queue_free(&redoq);
-  
+
   /* undo job rule disabling */
   for (i = 0; i < disabledq.count; i++)
     solver_enablerule(solv, solv->rules + disabledq.elements[i]);
@@ -3868,7 +4142,7 @@ void solver_get_recommendations(Solver *solv, Queue *recommendationsq, Queue *su
 /* disk usage computations */
 
 /*-------------------------------------------------------------------
- * 
+ *
  * calculate DU changes
  */
 
@@ -3884,7 +4158,7 @@ solver_calc_duchanges(Solver *solv, DUChanges *mps, int nmps)
 
 
 /*-------------------------------------------------------------------
- * 
+ *
  * calculate changes in install size
  */
 
@@ -3925,7 +4199,7 @@ solver_trivial_installable(Solver *solv, Queue *pkgs, Queue *res)
 }
 
 /*-------------------------------------------------------------------
- * 
+ *
  * decision introspection
  */
 
@@ -3988,7 +4262,7 @@ solver_describe_decision(Solver *solv, Id p, Id *infop)
 {
   int i;
   Id pp, why;
-  
+
   if (infop)
     *infop = 0;
   if (!solv->decisionmap[p])
@@ -4000,57 +4274,32 @@ solver_describe_decision(Solver *solv, Id p, Id *infop)
   if (i == solv->decisionq.count)      /* just in case... */
     return SOLVER_REASON_UNRELATED;
   why = solv->decisionq_why.elements[i];
+  if (infop)
+    *infop = why > 0 ? why : -why;
   if (why > 0)
-    {
-      if (infop)
-       *infop = why;
-      return SOLVER_REASON_UNIT_RULE;
-    }
+    return SOLVER_REASON_UNIT_RULE;
   why = -why;
   if (i < solv->decisioncnt_update)
     {
       if (i == 0)
-       {
-         if (infop)
-           *infop = SYSTEMSOLVABLE;
-         return SOLVER_REASON_KEEP_INSTALLED;
-       }
-      if (infop)
-       *infop = why;
+       return SOLVER_REASON_KEEP_INSTALLED;
       return SOLVER_REASON_RESOLVE_JOB;
     }
   if (i < solv->decisioncnt_keep)
     {
       if (why == 0 && pp < 0)
        return SOLVER_REASON_CLEANDEPS_ERASE;
-      if (infop)
-       {
-         if (why >= solv->updaterules && why < solv->updaterules_end)
-           *infop = why - solv->updaterules;
-         else if (why >= solv->featurerules && why < solv->featurerules_end)
-           *infop = why - solv->featurerules;
-       }
       return SOLVER_REASON_UPDATE_INSTALLED;
     }
   if (i < solv->decisioncnt_resolve)
     {
       if (why == 0 && pp < 0)
        return SOLVER_REASON_CLEANDEPS_ERASE;
-      if (infop)
-       {
-         if (why >= solv->updaterules && why < solv->updaterules_end)
-           *infop = why - solv->updaterules;
-         else if (why >= solv->featurerules && why < solv->featurerules_end)
-           *infop = why - solv->featurerules;
-       }
       return SOLVER_REASON_KEEP_INSTALLED;
     }
-  if (i < solv->decisioncnt_weak)
-    {
-      if (infop)
-       *infop = why;
-      return SOLVER_REASON_RESOLVE;
-    }
+  if (why > 0)
+    return SOLVER_REASON_RESOLVE;
+  /* weak or orphaned */
   if (solv->decisionq.count < solv->decisioncnt_orphan)
     return SOLVER_REASON_WEAKDEP;
   return SOLVER_REASON_RESOLVE_ORPHAN;
@@ -4215,7 +4464,7 @@ pool_isemptyupdatejob(Pool *pool, Id how, Id what)
          Id obs, *obsp = s->repo->idarraydata + s->obsoletes;
          while ((obs = *obsp++) != 0)
            {
-             FOR_PROVIDES(pi, pip, obs) 
+             FOR_PROVIDES(pi, pip, obs)
                {
                  Solvable *si = pool->solvables + pi;
                  if (si->repo != pool->installed)
@@ -4231,3 +4480,387 @@ pool_isemptyupdatejob(Pool *pool, Id how, Id what)
     }
   return 1;
 }
+
+static int
+get_userinstalled_cmp(const void *ap, const void *bp, void *dp)
+{
+  return *(Id *)ap - *(Id *)bp;
+}
+
+static int
+get_userinstalled_cmp_names(const void *ap, const void *bp, void *dp)
+{
+  Pool *pool = dp;
+  return strcmp(pool_id2str(pool, *(Id *)ap), pool_id2str(pool, *(Id *)bp));
+}
+
+static void
+get_userinstalled_sort_uniq(Pool *pool, Queue *q, int flags)
+{
+  Id lastp = -1;
+  int i, j;
+  if ((flags & GET_USERINSTALLED_NAMES) != 0)
+    solv_sort(q->elements, q->count, sizeof(Id), get_userinstalled_cmp_names, pool);
+  else
+    solv_sort(q->elements, q->count, sizeof(Id), get_userinstalled_cmp, 0);
+  for (i = j = 0; i < q->count; i++)
+    if (q->elements[i] != lastp)
+      q->elements[j++] = lastp = q->elements[i];
+  queue_truncate(q, j);
+}
+
+void
+solver_get_userinstalled(Solver *solv, Queue *q, int flags)
+{
+  Pool *pool = solv->pool;
+  Id p, p2, pp;
+  Solvable *s;
+  Repo *installed = solv->installed;
+  int i, j;
+  Map userinstalled;
+  
+  map_init(&userinstalled, 0);
+  queue_empty(q);
+  /* first process jobs */
+  for (i = 0; i < solv->job.count; i += 2)
+    {
+      Id how = solv->job.elements[i];
+      Id what, select;
+      if (installed && (how & SOLVER_JOBMASK) == SOLVER_USERINSTALLED)
+       {
+         if (!userinstalled.size)
+           map_grow(&userinstalled, installed->end - installed->start);
+         what = solv->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);
+         continue;
+       }
+      if ((how & SOLVER_JOBMASK) != SOLVER_INSTALL)
+       continue;
+      if ((how & SOLVER_NOTBYUSER) != 0)
+       continue;
+      what = solv->job.elements[i + 1];
+      select = how & SOLVER_SELECTMASK;
+      FOR_JOB_SELECT(p, pp, select, what)
+        if (solv->decisionmap[p] > 0)
+         {
+           queue_push(q, p);
+#ifdef ENABLE_LINKED_PKGS
+           if (has_package_link(pool, pool->solvables + p))
+             {
+               int j;
+               Queue lq;
+               queue_init(&lq);
+               find_package_link(pool, pool->solvables + p, 0, &lq, 0, 0);
+               for (j = 0; j < lq.count; j++)
+                 if (solv->decisionmap[lq.elements[j]] > 0)
+                   queue_push(q, lq.elements[j]);
+             }
+#endif
+         }
+    }
+  /* now process updates of userinstalled packages */
+  if (installed && userinstalled.size)
+    {
+      for (i = 1; i < solv->decisionq.count; i++)
+       {
+         p = solv->decisionq.elements[i];
+         if (p <= 0)
+           continue;
+         s = pool->solvables + p;
+         if (!s->repo)
+           continue;
+         if (s->repo == installed)
+           {
+             if (MAPTST(&userinstalled, p - installed->start))
+               queue_push(q, p);
+             continue;
+           }
+         /* new package, check if we replace a userinstalled one */
+         FOR_PROVIDES(p2, pp, s->name)
+           {
+             Solvable *ps = pool->solvables + p2;
+             if (p2 == p || ps->repo != installed || !MAPTST(&userinstalled, p2 - installed->start))
+               continue;
+             if (!pool->implicitobsoleteusesprovides && s->name != ps->name)
+               continue;
+             if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, ps))
+               continue;
+             queue_push(q, p);
+             break;
+           }
+         if (!p2 && s->repo != installed && s->obsoletes)
+           {
+             Id obs, *obsp = s->repo->idarraydata + s->obsoletes;
+             while ((obs = *obsp++) != 0)
+               {
+                 FOR_PROVIDES(p2, pp, obs)
+                   {
+                     Solvable *ps = pool->solvables + p2;
+                     if (p2 == p || ps->repo != installed || !MAPTST(&userinstalled, p2 - installed->start))
+                       continue;
+                     if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs))
+                       continue;
+                     if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) 
+                       continue;
+                     queue_push(q, p); 
+                     break;
+                   }
+                 if (p2)
+                   break;
+               }
+           }
+       }
+    }
+  map_free(&userinstalled);
+  /* convert to names if asked */
+  if ((flags & GET_USERINSTALLED_NAMES) != 0)
+    {
+      for (i = 0; i < q->count; i++)
+       {
+         s = pool->solvables + q->elements[i];
+         q->elements[i] = s->name;
+       }
+    }
+  /* sort and unify */
+  if (q->count > 1)
+    get_userinstalled_sort_uniq(pool, q, flags);
+  /* invert if asked */
+  if ((flags & GET_USERINSTALLED_INVERTED) != 0)
+    {
+      /* first generate queue with all installed packages */
+      Queue invq;
+      queue_init(&invq);
+      for (i = 1; i < solv->decisionq.count; i++)
+       {
+         p = solv->decisionq.elements[i];
+         if (p <= 0)
+           continue;
+         s = pool->solvables + p;
+         if (!s->repo)
+           continue;
+         if ((flags & GET_USERINSTALLED_NAMES) != 0)
+           queue_push(&invq, s->name);
+         else
+           queue_push(&invq, p);
+       }
+      /* push q on invq, just in case... */
+      queue_insertn(&invq, invq.count, q->count, q->elements);
+      if (invq.count > 1)
+       get_userinstalled_sort_uniq(pool, &invq, flags);
+      /* subtract queues (easy as they are sorted and invq is a superset of q) */
+      if (q->count)
+       {
+         for (i = j = 0; i < invq.count; i++)
+           if (invq.elements[i] == q->elements[j])
+             {
+               invq.elements[i] = 0;
+               if (++j >= q->count)
+                 break;
+             }
+         queue_empty(q);
+       }
+      for (i = j = 0; i < invq.count; i++)
+       if (invq.elements[i])
+         queue_push(q, invq.elements[i]);
+      queue_free(&invq);
+    }
+}
+
+void
+pool_add_userinstalled_jobs(Pool *pool, Queue *q, Queue *job, int flags)
+{
+  int i;
+
+  if (flags & GET_USERINSTALLED_INVERTED)
+    {
+      Queue invq;
+      Id p, lastid;
+      Solvable *s;
+      int bad;
+      if (!pool->installed)
+       return;
+      queue_init(&invq);
+      FOR_REPO_SOLVABLES(pool->installed, p, s)
+       queue_push(&invq, flags & GET_USERINSTALLED_NAMES ? s->name : p);
+      queue_insertn(&invq, invq.count, q->count, q->elements);
+      if (invq.count > 1)
+        get_userinstalled_sort_uniq(pool, &invq, flags);
+      /* now the fun part, add q again, sort, and remove all dups */
+      queue_insertn(&invq, invq.count, q->count, q->elements);
+      if (invq.count > 1)
+       {
+         if ((flags & GET_USERINSTALLED_NAMES) != 0)
+           solv_sort(invq.elements, invq.count, sizeof(Id), get_userinstalled_cmp_names, pool);
+         else
+           solv_sort(invq.elements, invq.count, sizeof(Id), get_userinstalled_cmp, 0);
+       }
+      lastid = -1;
+      bad = 1;
+      for (i = 0; i < invq.count; i++)
+       {
+         if (invq.elements[i] == lastid)
+           {
+             bad = 1;
+             continue;
+           }
+         if (!bad)
+           queue_push2(job, SOLVER_USERINSTALLED | (flags & GET_USERINSTALLED_NAMES ? SOLVER_SOLVABLE_NAME : SOLVER_SOLVABLE), lastid);
+         bad = 0;
+         lastid = invq.elements[i];
+       }
+      if (!bad)
+       queue_push2(job, SOLVER_USERINSTALLED | (flags & GET_USERINSTALLED_NAMES ? SOLVER_SOLVABLE_NAME : SOLVER_SOLVABLE), lastid);
+      queue_free(&invq);
+    }
+  else
+    {
+      for (i = 0; i < q->count; i++)
+       queue_push2(job, SOLVER_USERINSTALLED | (flags & GET_USERINSTALLED_NAMES ? SOLVER_SOLVABLE_NAME : SOLVER_SOLVABLE), q->elements[i]);
+    }
+}
+
+const char *
+solver_select2str(Pool *pool, Id select, Id what)
+{
+  const char *s;
+  char *b;
+  select &= SOLVER_SELECTMASK;
+  if (select == SOLVER_SOLVABLE)
+    return pool_solvid2str(pool, what);
+  if (select == SOLVER_SOLVABLE_NAME)
+    return pool_dep2str(pool, what);
+  if (select == SOLVER_SOLVABLE_PROVIDES)
+    {
+      s = pool_dep2str(pool, what);
+      b = pool_alloctmpspace(pool, 11 + strlen(s));
+      sprintf(b, "providing %s", s);
+      return b;
+    }
+  if (select == SOLVER_SOLVABLE_ONE_OF)
+    {
+      Id p;
+      b = 0;
+      while ((p = pool->whatprovidesdata[what++]) != 0)
+       {
+         s = pool_solvid2str(pool, p);
+         if (b)
+           b = pool_tmpappend(pool, b, ", ", s);
+         else
+           b = pool_tmpjoin(pool, s, 0, 0);
+         pool_freetmpspace(pool, s);
+       }
+      return b ? b : "nothing";
+    }
+  if (select == SOLVER_SOLVABLE_REPO)
+    {
+      b = pool_alloctmpspace(pool, 20);
+      sprintf(b, "repo #%d", what);
+      return b;
+    }
+  if (select == SOLVER_SOLVABLE_ALL)
+    return "all packages";
+  return "unknown job select";
+}
+
+const char *
+pool_job2str(Pool *pool, Id how, Id what, Id flagmask)
+{
+  Id select = how & SOLVER_SELECTMASK;
+  const char *strstart = 0, *strend = 0;
+  char *s;
+  int o;
+
+  switch (how & SOLVER_JOBMASK)
+    {
+    case SOLVER_NOOP:
+      return "do nothing";
+    case SOLVER_INSTALL:
+      if (select == SOLVER_SOLVABLE && pool->installed && pool->solvables[what].repo == pool->installed)
+       strstart = "keep ", strend = " installed";
+      else if (select == SOLVER_SOLVABLE || select == SOLVER_SOLVABLE_NAME)
+       strstart = "install ";
+      else if (select == SOLVER_SOLVABLE_PROVIDES)
+       strstart = "install a package ";
+      else
+       strstart = "install one of ";
+      break;
+    case SOLVER_ERASE:
+      if (select == SOLVER_SOLVABLE && !(pool->installed && pool->solvables[what].repo == pool->installed))
+       strstart = "keep ", strend = " uninstalled";
+      else if (select == SOLVER_SOLVABLE_PROVIDES)
+       strstart = "deinstall all packages ";
+      else
+       strstart = "deinstall ";
+      break;
+    case SOLVER_UPDATE:
+      strstart = "update ";
+      break;
+    case SOLVER_WEAKENDEPS:
+      strstart = "weaken deps of ";
+      break;
+    case SOLVER_MULTIVERSION:
+      strstart = "multi version ";
+      break;
+    case SOLVER_LOCK:
+      strstart = "lock ";
+      break;
+    case SOLVER_DISTUPGRADE:
+      strstart = "dist upgrade ";
+      break;
+    case SOLVER_VERIFY:
+      strstart = "verify ";
+      break;
+    case SOLVER_DROP_ORPHANED:
+      strstart = "deinstall ", strend = " if orphaned";
+      break;
+    case SOLVER_USERINSTALLED:
+      strstart = "regard ", strend = " as userinstalled";
+      break;
+    default:
+      strstart = "unknown job ";
+      break;
+    }
+  s = pool_tmpjoin(pool, strstart, solver_select2str(pool, select, what), strend);
+  how &= flagmask;
+  if ((how & ~(SOLVER_SELECTMASK|SOLVER_JOBMASK)) == 0)
+    return s;
+  o = strlen(s);
+  s = pool_tmpappend(pool, s, " ", 0);
+  if (how & SOLVER_WEAK)
+    s = pool_tmpappend(pool, s, ",weak", 0);
+  if (how & SOLVER_ESSENTIAL)
+    s = pool_tmpappend(pool, s, ",essential", 0);
+  if (how & SOLVER_CLEANDEPS)
+    s = pool_tmpappend(pool, s, ",cleandeps", 0);
+  if (how & SOLVER_ORUPDATE)
+    s = pool_tmpappend(pool, s, ",orupdate", 0);
+  if (how & SOLVER_FORCEBEST)
+    s = pool_tmpappend(pool, s, ",forcebest", 0);
+  if (how & SOLVER_TARGETED)
+    s = pool_tmpappend(pool, s, ",targeted", 0);
+  if (how & SOLVER_SETEV)
+    s = pool_tmpappend(pool, s, ",setev", 0);
+  if (how & SOLVER_SETEVR)
+    s = pool_tmpappend(pool, s, ",setevr", 0);
+  if (how & SOLVER_SETARCH)
+    s = pool_tmpappend(pool, s, ",setarch", 0);
+  if (how & SOLVER_SETVENDOR)
+    s = pool_tmpappend(pool, s, ",setvendor", 0);
+  if (how & SOLVER_SETREPO)
+    s = pool_tmpappend(pool, s, ",setrepo", 0);
+  if (how & SOLVER_SETNAME)
+    s = pool_tmpappend(pool, s, ",setname", 0);
+  if (how & SOLVER_NOAUTOSET)
+    s = pool_tmpappend(pool, s, ",noautoset", 0);
+  if (s[o + 1] != ',')
+    s = pool_tmpappend(pool, s, ",?", 0);
+  s[o + 1] = '[';
+  return pool_tmpappend(pool, s, "]", 0);
+}
+