From 0c833337bceca33ab3009522cac1a54edfe5dba3 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 13 Sep 2016 13:14:26 +0200 Subject: [PATCH] Allow noarch when comparing architectures in problem rule finding --- src/problems.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 */ -- 2.47.2