From: Michael Schroeder <mls@suse.de>
Date: Fri, 5 Dec 2008 09:42:59 +0000 (+0000)
Subject: - initialize decisioncount before installing supplemented packages
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0dfed419fa214e1473d837bf73db4509d6317a2;p=thirdparty%2Flibsolv.git

- initialize decisioncount before installing supplemented packages
---

diff --git a/src/solver.c b/src/solver.c
index 22c9df6b..996fdde9 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -2918,7 +2918,7 @@ run_solver(Solver *solv, int disablerules, int doweak)
 	  if (dq.count)
 	    {
 	      Map dqmap;
-	      int decisioncount;
+	      int decisioncount = solv->decisionq.count;
 
 	      if (dq.count == 1)
 		{
@@ -2952,7 +2952,7 @@ run_solver(Solver *solv, int disablerules, int doweak)
 		  if (level <= olevel)
 		    break;
 		}
-	      if (i < dqs.count)
+	      if (i < dqs.count || solv->decisionq.count < decisioncount)
 		{
 		  map_free(&dqmap);
 		  continue;
@@ -2961,7 +2961,6 @@ run_solver(Solver *solv, int disablerules, int doweak)
 	      /* install all recommended packages */
 	      /* more work as we want to created branches if multiple
                * choices are valid */
-	      decisioncount = solv->decisionq.count;
 	      for (i = 0; i < decisioncount; i++)
 		{
 		  Id rec, *recp, pp;