From: Michael Schroeder <mls@suse.de>
Date: Thu, 11 Apr 2019 12:13:46 +0000 (+0200)
Subject: Be more correct with multiversion packages that obsolete their own name
X-Git-Tag: 0.7.5~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4975df65e8ccb246532f26aeb936c187e5a4c489;p=thirdparty%2Flibsolv.git

Be more correct with multiversion packages that obsolete their own name

We used to simply ignore the obsoletes. There are use cases which
need them, though. So do the right thing.
---

diff --git a/src/cleandeps.c b/src/cleandeps.c
index 8ef6fd3b..aa83c10b 100644
--- a/src/cleandeps.c
+++ b/src/cleandeps.c
@@ -836,7 +836,7 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded)
 		    if (MAPTST(&solv->multiversion, p))
 		      break;
 		  if (p)
-		    continue;
+		    continue;	/* found a multiversion package that will not obsolate anything */
 		}
 
 	      om.size = 0;
diff --git a/src/rules.c b/src/rules.c
index b6cd582b..6c8c296c 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -1328,6 +1328,31 @@ solver_addfeaturerule(Solver *solv, Solvable *s)
     }
 }
 
+/* check if multiversion solvable s2 has an obsoletes for installed solvable s */
+static int
+is_multiversion_obsoleteed(Pool *pool, Solvable *s, Solvable *s2)
+{
+  Id *wp, obs, *obsp;
+
+  if (pool->obsoleteusescolors && !pool_colormatch(pool, s, s2))
+    return 0;
+  obsp = s2->repo->idarraydata + s2->obsoletes;
+  if (!pool->obsoleteusesprovides)
+    {
+      while ((obs = *obsp++) != 0)
+        if (pool_match_nevr(pool, s, obs))
+	  return 1;
+    }
+  else
+    {
+      while ((obs = *obsp++) != 0)
+        for (wp = pool_whatprovides_ptr(pool, obs); *wp; wp++)
+	  if (pool->solvables + *wp == s)
+	    return 1;
+    }
+  return 0;
+}
+
 /*-------------------------------------------------------------------
  *
  * add rule for update
@@ -1389,9 +1414,8 @@ solver_addupdaterule(Solver *solv, Solvable *s)
 	      if (MAPTST(&solv->multiversion, qs.elements[i]))
 		{
 		  Solvable *ps = pool->solvables + qs.elements[i];
-		  /* if keepexplicitobsoletes is set and the name is different,
-		   * we assume that there is an obsoletes. XXX: not 100% correct */
-		  if (solv->keepexplicitobsoletes && ps->name != s->name)
+		  /* check if there is an explicit obsoletes */
+		  if (solv->keepexplicitobsoletes && ps->obsoletes && is_multiversion_obsoleteed(pool, s, ps))
 		    {
 		      qs.elements[j++] = qs.elements[i];
 		      continue;
@@ -2189,7 +2213,7 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
 	  if (pool->solvables[p].repo == installed)
 	    return;
 	  if (solv->multiversion.size && MAPTST(&solv->multiversion, p) && !solv->keepexplicitobsoletes)
-	    return;
+	    return;		/* will not obsolete anything, so just return */
 	}
       omap.size = 0;
       qstart = q->count;