From: Michael Schroeder <mls@suse.de>
Date: Tue, 13 Feb 2024 11:43:50 +0000 (+0100)
Subject: resolve_installed: remove dead code
X-Git-Tag: 0.7.29~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553c69b514c1ca85a6311373b48c6096886dcff3;p=thirdparty%2Flibsolv.git

resolve_installed: remove dead code

Since we simplified our dup handling the update rules always
start with the installed package.
---

diff --git a/src/solver.c b/src/solver.c
index 363d8873..0c3333d8 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -1835,11 +1835,10 @@ resolve_installed(Solver *solv, int level, int disablerules, Queue *dq)
 
 	  /* 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 */
+	   * the installed package and not replace it with a newer version */
 	  if (dq->count)
 	    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 && 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))))
 	    {
 	      if (specialupdaters && (d = specialupdaters[i - installed->start]) != 0)
 		{