From: Michael Schroeder <mls@suse.de>
Date: Tue, 13 Sep 2016 11:14:26 +0000 (+0200)
Subject: Allow noarch when comparing architectures in problem rule finding
X-Git-Tag: 0.6.24~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c833337bceca33ab3009522cac1a54edfe5dba3;p=thirdparty%2Flibsolv.git

Allow noarch when comparing architectures in problem rule finding
---

diff --git a/src/problems.c b/src/problems.c
index b57d980a..54c862ac 100644
--- a/src/problems.c
+++ b/src/problems.c
@@ -962,8 +962,11 @@ findproblemrule_internal(Solver *solv, Id idx, Id *reqrp, Id *conrp, Id *sysrp,
 		{
 		  if (*reqrp > 0 && r->p < -1)
 		    {
+		      Pool *pool = solv->pool;
 		      Id op = -solv->rules[*reqrp].p;
-		      if (op > 1 && solv->pool->solvables[op].arch != solv->pool->solvables[-r->p].arch)
+		      if (op > 1 && pool->solvables[op].arch != pool->solvables[-r->p].arch &&
+			  pool->solvables[op].arch != pool->noarchid &&
+			  pool->solvables[-r->p].arch != pool->noarchid)
 			continue;	/* different arch, skip */
 		    }
 		  /* prefer assertions */