From: Michael Schroeder Date: Tue, 12 Jul 2016 12:14:20 +0000 (+0200) Subject: Also look at the arch when sorting obsoleters X-Git-Tag: 0.6.23~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd34d63f0884b32603cdbf91c3dc952b7b35948;p=thirdparty%2Flibsolv.git Also look at the arch when sorting obsoleters --- diff --git a/src/transaction.c b/src/transaction.c index ffe1ec2a..9a329661 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -56,6 +56,14 @@ obsq_sortcmp(const void *ap, const void *bp, void *dp) r = pool_evrcmp(pool, oas->evr, obs->evr, EVRCMP_COMPARE); if (r) return -r; /* highest version first */ + if (oas->arch != obs->arch) + { + /* bring same arch to front */ + if (oas->arch == s->arch) + return -1; + if (obs->arch == s->arch) + return 1; + } return oa - ob; }