From: Michael Schroeder <mls@suse.de>
Date: Tue, 12 Nov 2024 09:44:07 +0000 (+0100)
Subject: Use the correct solvable id when checking the noarch map
X-Git-Tag: 0.7.31~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f525415b10622054a2ce92718e7bea3a443738f0;p=thirdparty%2Flibsolv.git

Use the correct solvable id when checking the noarch map

Fixes issue #574
---

diff --git a/src/solver.c b/src/solver.c
index edd7ff81..2d78f80a 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -1148,7 +1148,7 @@ replaces_installed_package(Pool *pool, Id p, Map *noupdate)
   FOR_PROVIDES(p2, pp2, s->name)
     {
       s2 = pool->solvables + p2;
-      if (s2->repo == installed && s2->name == s->name && !(noupdate && MAPTST(noupdate, p - installed->start)))
+      if (s2->repo == installed && s2->name == s->name && !(noupdate && MAPTST(noupdate, p2 - installed->start)))
 	return 1;
     }
   if (!s->obsoletes)
@@ -1159,7 +1159,7 @@ replaces_installed_package(Pool *pool, Id p, Map *noupdate)
       FOR_PROVIDES(p2, pp2, obs)
 	{
 	  s2 = pool->solvables + p2;
-	  if (s2->repo != pool->installed || (noupdate && MAPTST(noupdate, p - installed->start)))
+	  if (s2->repo != pool->installed || (noupdate && MAPTST(noupdate, p2 - installed->start)))
 	    continue;
 	  if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, s2, obs))
 	    continue;