From: Michael Schroeder <mls@suse.de>
Date: Fri, 24 Jul 2009 13:29:17 +0000 (+0200)
Subject: - dropped choice optimization code, it does too much harm
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~165^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2055d2f99290a95526e3547306824099887e14fc;p=platform%2Fupstream%2Flibsolv.git

- dropped choice optimization code, it does too much harm
---

diff --git a/src/rules.c b/src/rules.c
index 4429f50..5a186da 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -1777,7 +1777,7 @@ addchoicerules(Solver *solv)
   Pool *pool = solv->pool;
   Rule *r;
   Queue q;
-  int i, rid, havechoice;
+  int rid, havechoice;
   Id p, d, *pp;
   Id p2, pp2;
   Solvable *s, *s2;
@@ -1868,30 +1868,10 @@ addchoicerules(Solver *solv)
 	}
       if (!havechoice || !q.count)
 	continue;	/* no choice */
-      for (i = 0; i < q.count; i++)
-	{
-	  int j;
-	  s = pool->solvables + q.elements[i];
-	  if (s->repo == pool->installed)
-	    continue;
-	  for (j = 0; j < q.count; j++)
-	    {
-	      if (i == j)
-		continue;
-	      s2 = pool->solvables + q.elements[j];
-	      if (s2->repo != pool->installed)
-		continue;
-	      if (solvable_identical(s, s2))
-		break;
-	    }
-	  if (j == q.count)
-	    break;
-	}
-      if (i == q.count)
-	continue;	/* only (identical to) installed packages */
       d = q.count ? pool_queuetowhatprovides(pool, &q) : 0;
       solver_addrule(solv, r->p, d);
       queue_push(&solv->weakruleq, solv->nrules - 1);
+      /* solver_printrule(solv, SAT_DEBUG_RESULT, solv->rules + solv->nrules - 1); */
     }
   queue_free(&q);
   solv->choicerules_end = solv->nrules;