]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
Prefer SOLVER_RULE_PKG_SAME_NAME in solver_ruleinfo
authorMichael Schroeder <mls@suse.de>
Fri, 9 Sep 2022 12:08:58 +0000 (14:08 +0200)
committerMichael Schroeder <mls@suse.de>
Fri, 9 Sep 2022 12:08:58 +0000 (14:08 +0200)
src/rules.c

index 2c56959ca6f494ee39e28c70ce4a159e70738778..f57ccbfaf256a858086da4612bfd29e3a1254ffa 100644 (file)
@@ -3008,7 +3008,7 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp)
          qp = rq.elements[i + 1];
          qo = rq.elements[i + 2];
          qd = rq.elements[i + 3];
-         if (type == SOLVER_RULE_PKG || type > qt)
+         if (type == SOLVER_RULE_PKG || SOLVER_RULE_PKG_SAME_NAME || type > qt)
            {
              type = qt;
              if (fromp)
@@ -3017,6 +3017,8 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp)
                *top = qo;
              if (depp)
                *depp = qd;
+             if (qt == SOLVER_RULE_PKG_SAME_NAME)
+               break;                  /* prefer SOLVER_RULE_PKG_SAME_NAME */
            }
        }
       queue_free(&rq);