From: Michael Schroeder Date: Wed, 16 Jan 2019 12:00:32 +0000 (+0100) Subject: Make solver_addinfarchrules slightly more readable X-Git-Tag: 0.7.3~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c28f90f82609248c75d94b4077314e7ec6da567;p=thirdparty%2Flibsolv.git Make solver_addinfarchrules slightly more readable --- diff --git a/src/rules.c b/src/rules.c index 175cb8d9..b6cd582b 100644 --- a/src/rules.c +++ b/src/rules.c @@ -1674,11 +1674,15 @@ solver_addinfarchrules(Solver *solv, Map *addedmap) } if (installed && pool->solvables[p].repo == installed && !haveinstalled) continue; /* installed package not in lock-step */ + if (lsq.count < 2) + solver_addrule(solv, -p, lsq.count ? lsq.elements[0] : 0, 0); + else + solver_addrule(solv, -p, 0, pool_queuetowhatprovides(pool, &lsq)); } - if (lsq.count < 2) - solver_addrule(solv, -p, lsq.count ? lsq.elements[0] : 0, 0); else - solver_addrule(solv, -p, 0, pool_queuetowhatprovides(pool, &lsq)); + { + solver_addrule(solv, -p, 0, 0); + } } } queue_free(&lsq);