projects
/
platform
/
upstream
/
libsolv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e6913e
)
fix trivial installable requires handling [bnc#795267]
author
Michael Schroeder
<mls@suse.de>
Thu, 3 Jan 2013 12:54:24 +0000
(13:54 +0100)
committer
Michael Schroeder
<mls@suse.de>
Thu, 3 Jan 2013 12:54:24 +0000
(13:54 +0100)
src/pool.c
patch
|
blob
|
history
diff --git
a/src/pool.c
b/src/pool.c
index
c44c96b
..
0f7c928
100644
(file)
--- 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))