diff options
| author | Michael Schroeder <mls@suse.de> | 2013-06-04 13:18:33 +0200 |
|---|---|---|
| committer | Michael Schroeder <mls@suse.de> | 2013-06-04 13:18:33 +0200 |
| commit | ee3a248c51e0189eeacafaf3a27fc1571af04253 (patch) | |
| tree | 8c385e66b6bf5eba92df683dfe742b295aa694c0 /src/rules.c | |
| parent | c63a0c9ce78bf828e91508981608f7973ac7b1a5 (diff) | |
| download | libsolv-ee3a248c51e0189eeacafaf3a27fc1571af04253.tar.gz libsolv-ee3a248c51e0189eeacafaf3a27fc1571af04253.tar.bz2 libsolv-ee3a248c51e0189eeacafaf3a27fc1571af04253.zip | |
add POOL_FLAG_IMPLICITOBSOLETEUSESCOLORS to match the current rpm behaviour
Sigh. I hope that's the last time rpm changes the way it handles obsoletes.
Diffstat (limited to 'src/rules.c')
| -rw-r--r-- | src/rules.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rules.c b/src/rules.c index 1c3244c..ae14eba 100644 --- a/src/rules.c +++ b/src/rules.c @@ -719,7 +719,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) continue; if (!pool->implicitobsoleteusesprovides && s->name != ps->name) continue; - if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) + if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, ps)) continue; if (s->name == ps->name) addrpmrule(solv, -n, -p, SOLVER_RULE_RPM_SAME_NAME, 0); @@ -1496,7 +1496,7 @@ add_obsoletes(Solver *solv, Id p, Queue *q) continue; if (!pool->implicitobsoleteusesprovides && ps->name != s->name) continue; - if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) + if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, ps)) continue; queue_push(q, p2); lastp2 = p2; @@ -2420,7 +2420,7 @@ solver_addchoicerules(Solver *solv) continue; if (!pool->implicitobsoleteusesprovides && s->name != s2->name) continue; - if (pool->obsoleteusescolors && !pool_colormatch(pool, s, s2)) + if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, s2)) continue; break; } |