From: Michael Schroeder <mls@suse.de>
Date: Fri, 15 Nov 2019 10:57:02 +0000 (+0100)
Subject: Ignore constrains conflicting with itself, tweak constrains problem message
X-Git-Tag: 0.7.9~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f3aed5f3f57689692dd6c335b11ca40149a1d36;p=thirdparty%2Flibsolv.git

Ignore constrains conflicting with itself, tweak constrains problem message
---

diff --git a/src/problems.c b/src/problems.c
index bcce038d..63165f3a 100644
--- a/src/problems.c
+++ b/src/problems.c
@@ -1343,7 +1343,7 @@ solver_problemruleinfo2str(Solver *solv, SolverRuleinfo type, Id source, Id targ
       return pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), " can only be installed by a direct request");
     case SOLVER_RULE_PKG_CONSTRAINS:
       s = pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), 0);
-      s = pool_tmpappend(pool, s, " has a constraint ", pool_dep2str(pool, dep));
+      s = pool_tmpappend(pool, s, " has constraint ", pool_dep2str(pool, dep));
       return pool_tmpappend(pool, s, " conflicting with ", pool_solvid2str(pool, target));
     default:
       return "bad problem rule type";
diff --git a/src/rules.c b/src/rules.c
index dc4b4137..1396a6cd 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -679,6 +679,8 @@ add_conda_constrains_rule(Solver *solv, Id n, Id dep)
   FOR_PROVIDES(p, pp, rd->name)
     {
       Id p2;
+      if (p == n)
+	continue;
       while ((p2 = pool->whatprovidesdata[pdep]) != 0 && p2 < p)
 	pdep++;
       if (p == p2)