From 80cc562d125daa090c1dbdba7aa85e0860ba9b90 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Thu, 3 Jan 2013 13:54:24 +0100 Subject: [PATCH] fix trivial installable requires handling [bnc#795267] --- src/pool.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pool.c b/src/pool.c index c44c96b8..0f7c9287 100644 --- a/src/pool.c +++ b/src/pool.c @@ -1911,9 +1911,12 @@ pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pk { /* decided and miss */ map[p] = 2; + did = 0; break; } - m |= r; /* 1 | 9 | 16 | 17 */ + if (r == 16) + break; /* undecided */ + m |= r; /* 1 | 9 | 17 */ } if (req) continue; @@ -1932,6 +1935,7 @@ pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pk if ((providedbyinstalled(pool, map, con, ispatch, noobsoletesmap) & 1) != 0) { map[p] = 2; + did = 0; break; } if ((m == 1 || m == 17) && ISRELDEP(con)) -- 2.47.2