rework splitprovides handling

We no longer consult the updatmap, but now check if a package was
updated with the update rule. This is so that we don't get
false positives if a package can't be updated for whatever
reason.

diff --git a/src/rules.c b/src/rules.c
index fc4fbb1e0415c6367f3175d33bfe9b105c82cc1e..c9bbf818cf7c83d3a8490e9b202e7502823cd0e4 100644 (file)
--- a/src/rules.c
+++ b/src/rules.c
@@ -65,7 +65,7 @@ dep_possible(Solver *solv, Id dep, Map *m)
              return dep_possible(solv, rd->evr, m);
            }
          if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
-           return solver_splitprovides(solv, rd->evr);
+           return solver_splitprovides(solv, rd->evr, m);
          if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
            return solver_dep_installed(solv, rd->evr);
        }
@@ -3571,7 +3571,11 @@ check_xsupp(Solver *solv, Queue *depq, Id dep)
              return check_xsupp(solv, depq, rd->evr);
            }
          if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
+#if 0
            return solver_splitprovides(solv, rd->evr);
+#else
+           return 0;
+#endif
          if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
            return solver_dep_installed(solv, rd->evr);
        }

diff --git a/src/solver.c b/src/solver.c
index d3260e43920acee6647871e09fe5a13a9a431826..46d0ca3612bb5d60c5ae4616549a61bd386df386 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -44,16 +44,34 @@
  * and is only true if pkg is installed and contains the specified path.
  * we also make sure that pkg is selected for an update, otherwise the
  * update would always be forced onto the user.
+ * Map m is the map used when called from dep_possible.
  */
+
+static int
+solver_is_updating(Solver *solv, Id p)
+{
+  /* check if the update rule is true */
+  Pool *pool = solv->pool;
+  Rule *r;
+  Id l, pp;
+  if (solv->decisionmap[p] >= 0)
+    return 0;  /* old package stayed */
+  r = solv->rules + solv->updaterules + (p - solv->installed->start);
+  FOR_RULELITERALS(l, pp, r)
+    if (l > 0 && l != p && solv->decisionmap[l] > 0)
+      return 1;
+  return 0;
+}
+
 int
-solver_splitprovides(Solver *solv, Id dep)
+solver_splitprovides(Solver *solv, Id dep, Map *m)
 {
   Pool *pool = solv->pool;
   Id p, pp;
   Reldep *rd;
   Solvable *s;
 
-  if (!solv->dosplitprovides || !solv->installed || (!solv->updatemap_all && !solv->updatemap.size))
+  if (!solv->dosplitprovides || !solv->installed)
     return 0;
   if (!ISRELDEP(dep))
     return 0;
@@ -76,8 +94,10 @@ solver_splitprovides(Solver *solv, Id dep)
       /* here we have packages that provide the correct name and contain the path,
        * now do extra filtering */
       s = pool->solvables + p;
-      if (s->repo == solv->installed && s->name == rd->name &&
-          (solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, p - solv->installed->start))))
+      if (s->repo != solv->installed || s->name != rd->name)
+       continue;
+      /* check if the package is updated. if m is set, we're called from dep_possible */
+      if (m || solver_is_updating(solv, p))
        return 1;
     }
   return 0;
@@ -147,7 +167,7 @@ solver_check_installsuppdepq_dep(Solver *solv, Id dep)
           return r1 == 2 || r2 == 2 ? 2 : 1;
        }
       if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
-        return solver_splitprovides(solv, rd->evr);
+        return solver_splitprovides(solv, rd->evr, 0);
       if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
         return solver_dep_installed(solv, rd->evr);
       if (rd->flags == REL_NAMESPACE && (q = solv->installsuppdepq) != 0)
@@ -2566,7 +2586,6 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
           /* filter out all already supplemented packages if requested */
           if (!solv->addalreadyrecommended && dqs.count)
            {
-             int dosplitprovides_old = solv->dosplitprovides;
              /* turn off all new packages */
              for (i = 0; i < solv->decisionq.count; i++)
                {
@@ -2577,7 +2596,6 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                  if (s->repo && s->repo != solv->installed)
                    solv->decisionmap[p] = -solv->decisionmap[p];
                }
-             solv->dosplitprovides = 0;
              /* filter out old supplements */
              for (i = j = 0; i < dqs.count; i++)
                {
@@ -2601,7 +2619,6 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
                  if (s->repo && s->repo != solv->installed)
                    solv->decisionmap[p] = -solv->decisionmap[p];
                }
-             solv->dosplitprovides = dosplitprovides_old;
            }
 
          /* multiversion doesn't mix well with supplements.
@@ -3635,13 +3652,7 @@ solver_solve(Solver *solv, Queue *job)
    */
   oldnrules = solv->nrules;
   if (hasdupjob && !solv->updatemap_all && solv->dosplitprovides && solv->installed)
-    {
-      /* solver_splitprovides checks if the package is in the update map, but the update
-       * map is extended for dup jobs. So temporarily set updatemap_all */
-      solv->updatemap_all = 1;
-      solver_addpkgrulesforweak(solv, &addedmap);
-      solv->updatemap_all = 0;
-    }
+    solver_addpkgrulesforweak(solv, &addedmap);
   else
     solver_addpkgrulesforweak(solv, &addedmap);
   POOL_DEBUG(SOLV_DEBUG_STATS, "added %d pkg rules because of weak dependencies\n", solv->nrules - oldnrules);

diff --git a/src/solver_private.h b/src/solver_private.h
index 170efc2a70bc6554ba2f557f7f162c4f96012f7c..f30b03a91c500015aabe84dcaa7d62a72fe17915 100644 (file)
--- a/src/solver_private.h
+++ b/src/solver_private.h
@@ -17,7 +17,7 @@ extern void solver_run_sat(Solver *solv, int disablerules, int doweak);
 extern void solver_reset(Solver *solv);
 
 extern int solver_dep_installed(Solver *solv, Id dep);
-extern int solver_splitprovides(Solver *solv, Id dep);
+extern int solver_splitprovides(Solver *solv, Id dep, Map *m);
 
 static inline int
 solver_dep_fulfilled(Solver *solv, Id dep)
@@ -41,7 +41,7 @@ solver_dep_fulfilled(Solver *solv, Id dep)
           return solver_dep_fulfilled(solv, rd->evr);
        }
       if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
-        return solver_splitprovides(solv, rd->evr);
+        return solver_splitprovides(solv, rd->evr, 0);
       if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
         return solver_dep_installed(solv, rd->evr);
     }