From: Michael Schroeder <mls@suse.de>
Date: Fri, 9 Sep 2022 12:08:58 +0000 (+0200)
Subject: Prefer SOLVER_RULE_PKG_SAME_NAME in solver_ruleinfo
X-Git-Tag: 0.7.23~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26fcfa714a29d1feb393e9a61f9d1a04556866a6;p=thirdparty%2Flibsolv.git

Prefer SOLVER_RULE_PKG_SAME_NAME in solver_ruleinfo
---

diff --git a/src/rules.c b/src/rules.c
index 2c56959c..f57ccbfa 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -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);