From: Michael Schroeder <mls@suse.de>
Date: Fri, 15 Nov 2019 12:01:45 +0000 (+0100)
Subject: Don't complain about constrains between two installed packages
X-Git-Tag: 0.7.9~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f5e35a19f4217480f53694134376cd20f300405;p=thirdparty%2Flibsolv.git

Don't complain about constrains between two installed packages
---

diff --git a/src/rules.c b/src/rules.c
index 9ab14d2b..e31fe01b 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -667,7 +667,7 @@ add_complex_deprules(Solver *solv, Id p, Id dep, int type, int dontfix, Queue *w
 
 #ifdef ENABLE_CONDA
 void
-add_conda_constrains_rule(Solver *solv, Id n, Id dep)
+add_conda_constrains_rule(Solver *solv, Id n, Id dep, int dontfix)
 {
   Pool *pool = solv->pool;
   Reldep *rd;
@@ -681,6 +681,8 @@ add_conda_constrains_rule(Solver *solv, Id n, Id dep)
       Id p2;
       if (p == n)
 	continue;
+      if (dontfix && pool->solvables[p].repo == solv->installed)
+	continue;
       while ((p2 = pool->whatprovidesdata[pdep]) != 0 && p2 < p)
 	pdep++;
       if (p == p2)
@@ -925,7 +927,7 @@ solver_addpkgrulesforsolvable(Solver *solv, Solvable *s, Map *m)
 	{
 	  solvable_lookup_idarray(s, SOLVABLE_CONSTRAINS, &depq);
 	  for (i = 0; i < depq.count; i++)
-	    add_conda_constrains_rule(solv, n, depq.elements[i]);
+	    add_conda_constrains_rule(solv, n, depq.elements[i], dontfix);
 	}
 #endif