]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
Make solver_addinfarchrules slightly more readable
authorMichael Schroeder <mls@suse.de>
Wed, 16 Jan 2019 12:00:32 +0000 (13:00 +0100)
committerMichael Schroeder <mls@suse.de>
Thu, 24 Jan 2019 15:26:48 +0000 (16:26 +0100)
src/rules.c

index 175cb8d976e47a58a0a3ff19a67893222dbc4bb9..b6cd582ba5b086f4b42a2e2547c133174ae0a0b4 100644 (file)
@@ -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);