From: Michael Schroeder <mls@suse.de>
Date: Wed, 27 May 2020 09:36:56 +0000 (+0200)
Subject: Support rules with multiple neg literals in choice rule generation
X-Git-Tag: 0.7.14~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a32baa860dee76aa0f2c19c6e7578468f4a9c2e9;p=thirdparty%2Flibsolv.git

Support rules with multiple neg literals in choice rule generation
---

diff --git a/src/rules.c b/src/rules.c
index 6b1432f4..ffa29887 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -3210,7 +3210,7 @@ solver_addchoicerules(Solver *solv)
   Map m, mneg;
   Rule *r;
   Queue q, qi, qcheck, infoq;
-  int i, j, rid, havechoice;
+  int i, j, rid, havechoice, negcnt;
   Id p, d, pp;
   Id p2, pp2;
   Solvable *s, *s2;
@@ -3389,9 +3389,12 @@ solver_addchoicerules(Solver *solv)
 	      qi.elements[j] = 0;
 	}
       /* empty map again */
+      negcnt = 0;
       FOR_RULELITERALS(p, pp, r)
         if (p > 0)
 	  MAPCLR(&m, p);
+	else
+	  negcnt++;
       if (i == qi.count)
 	{
 #if 0
@@ -3400,7 +3403,14 @@ solver_addchoicerules(Solver *solv)
 #endif
 	  continue;
 	}
-
+      /* add neg elements to the front */
+      if (negcnt > 1)
+	{
+	  i = 0;
+	  FOR_RULELITERALS(p, pp, r)
+	   if (p < 0 && p != r->p)
+	     queue_insert(&q, i++, p);
+	}
       /* don't add identical rules */
       if (lastaddedp == r->p && lastaddedcnt == q.count)
 	{