From a371cee8de7c8f0daf70f1ea9a6957c89f844f46 Mon Sep 17 00:00:00 2001 From: Adrien DELSALLE Date: Mon, 9 Aug 2021 13:20:03 +0200 Subject: [PATCH] do not clear providers of a name having a different name it would prevent those solvables for being excluded by strict channel priority --- src/rules.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/rules.c b/src/rules.c index 0dcce68e9..5a61939cf 100644 --- a/src/rules.c +++ b/src/rules.c @@ -4165,24 +4165,21 @@ void solver_addstrictrepopriorules(struct s_Solver *solv, Map *addedmap) { Solvable *s2 = pool->solvables + p2; if (s->name != s2->name) - { - MAPCLR(&priomap, p2); continue; - } if (s2->repo->priority > max_prio) max_prio = s2->repo->priority; } - FOR_PROVIDES(p2, pp2, s->name) + FOR_PROVIDES(p2, pp2, s->name) { Solvable *s2 = pool->solvables + p2; - if (!MAPTST(&priomap, p2)) - continue; - MAPCLR(&priomap, p2); + if (s->name != s2->name || !MAPTST(&priomap, p2)) + continue; + MAPCLR(&priomap, p2); if (pool->installed && s2->repo == pool->installed) continue; - if (s2->repo->priority < max_prio) - solver_addrule(solv, -p2, 0, 0); + if (s2->repo->priority < max_prio) + solver_addrule(solv, -p2, 0, 0); } } solv->strictrepopriorules_end = solv->nrules;