ref: refs/heads/master commit f66e759a613fe9a65d15e5e6226078cd316fa07e Author: Michael Schroeder Date: Mon Apr 27 17:17:45 2009 +0200 - fix distupgrade infarch check --- src/solver.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/solver.c b/src/solver.c index 2d64b66..2329f19 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)) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org