summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2013-01-03 13:54:24 +0100
committerMichael Schroeder <mls@suse.de>2013-01-03 13:54:24 +0100
commit80cc562d125daa090c1dbdba7aa85e0860ba9b90 (patch)
treec2684cb3c37d2619502c7af46680981d1a24bc5b
parent1e6913e40831c0c7692d9b4e3a47e268e47020c2 (diff)
downloadlibsolv-80cc562d125daa090c1dbdba7aa85e0860ba9b90.tar.gz
libsolv-80cc562d125daa090c1dbdba7aa85e0860ba9b90.tar.bz2
libsolv-80cc562d125daa090c1dbdba7aa85e0860ba9b90.zip
fix trivial installable requires handling [bnc#795267]
-rw-r--r--src/pool.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pool.c b/src/pool.c
index c44c96b..0f7c928 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))