From: Michael Schroeder <mls@suse.de>
Date: Tue, 22 Dec 2015 10:48:24 +0000 (+0100)
Subject: Add back code to set specialupdaters for multiversion packages that should be updated
X-Git-Tag: 0.6.17~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9762f8b80ec4b9b689a2a8439334a15775a4a1b5;p=thirdparty%2Flibsolv.git

Add back code to set specialupdaters for multiversion packages that should be updated
---

diff --git a/src/rules.c b/src/rules.c
index 70d6b073..6f357203 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -1206,6 +1206,17 @@ addduppackages(Solver *solv, Solvable *s, Queue *qs)
 }
 #endif
 
+/* stash away the original updaters for multiversion packages. We do this so that
+ * we can update the package later */
+static inline void
+set_specialupdaters(Solver *solv, Solvable *s, Id d)
+{
+  Repo *installed = solv->installed;
+  if (!solv->specialupdaters)
+    solv->specialupdaters = solv_calloc(installed->end - installed->start, sizeof(Id));
+  solv->specialupdaters[s - solv->pool->solvables - installed->start] = d;
+}
+
 /*-------------------------------------------------------------------
  *
  * add rule for update
@@ -1245,9 +1256,8 @@ solver_addupdaterule(Solver *solv, Solvable *s, int allow_all)
 	    {
 	      if (p != -SYSTEMSOLVABLE)
 	        queue_unshift(&qs, p);
-	      if (!solv->specialupdaters)
-		solv->specialupdaters = solv_calloc(solv->installed->end - solv->installed->start, sizeof(Id));
-	      solv->specialupdaters[s - pool->solvables - solv->installed->start] = pool_queuetowhatprovides(pool, &qs);
+	      if (qs.count)
+	        set_specialupdaters(solv, s, pool_queuetowhatprovides(pool, &qs));
 	    }
 	  queue_free(&qs);
 	  return;
@@ -1300,9 +1310,7 @@ solver_addupdaterule(Solver *solv, Solvable *s, int allow_all)
 		{
 		  /* this is a multiversion orphan */
 		  queue_push(&solv->orphaned, s - pool->solvables);
-		  if (!solv->specialupdaters)
-		    solv->specialupdaters = solv_calloc(solv->installed->end - solv->installed->start, sizeof(Id));
-		  solv->specialupdaters[s - pool->solvables - solv->installed->start] = d;
+		  set_specialupdaters(solv, s, d);
 		  if (solv->keep_orphans && !(solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, s - pool->solvables - solv->installed->start))))
 		    {
 		      /* we need to keep the orphan */
@@ -1314,6 +1322,11 @@ solver_addupdaterule(Solver *solv, Solvable *s, int allow_all)
 		  isorphaned = 1;
 		  j = qs.count;		/* force the update */
 		}
+	      else if (d && (solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, s - pool->solvables - solv->installed->start))))
+		{
+		  /* non-orphan multiversion package, set special updaters if we want an update */
+		  set_specialupdaters(solv, s, d);
+		}
 	      qs.count = j;
 	    }
 	  else if (p != -SYSTEMSOLVABLE)