Allow noarch when comparing architectures in problem rule finding

diff --git a/src/problems.c b/src/problems.c
index b57d980a4873ecbb75e9110aae9c79affad24a6d..54c862ac16f7d6ddda85efb8d62bbf4d9dea1a13 100644 (file)
--- 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 */