From: Michael Schroeder <mls@suse.de>
Date: Mon, 27 Apr 2009 15:17:45 +0000 (+0200)
Subject: - fix distupgrade infarch check
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f0c94be674cfcb7e38ad471963f221f01fed54b;p=thirdparty%2Flibsolv.git

- fix distupgrade infarch check
---

diff --git a/src/solver.c b/src/solver.c
index 2d64b666..2329f193 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -4227,9 +4227,10 @@ addinfarchrules(Solver *solv, Map *addedmap)
 	    break;
 	  a = ps->arch;
 	  a = (a <= pool->lastarch) ? pool->id2arch[a] : 0;
-	  if (a != 1 && pool->installed && ps->repo == pool->installed && !solv->distupgrade)
+	  if (a != 1 && pool->installed && ps->repo == pool->installed)
 	    {
-	      queue_pushunique(&allowedarchs, ps->arch);	/* also ok to keep this architecture */
+	      if (!solv->distupgrade)
+	        queue_pushunique(&allowedarchs, ps->arch);	/* also ok to keep this architecture */
 	      continue;		/* ignore installed solvables when calculating the best arch */
 	    }
 	  if (a && a != 1 && (!bestarch || a < bestarch))