]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
- initialize decisioncount before installing supplemented packages
authorMichael Schroeder <mls@suse.de>
Fri, 5 Dec 2008 09:42:59 +0000 (09:42 +0000)
committerMichael Schroeder <mls@suse.de>
Fri, 5 Dec 2008 09:42:59 +0000 (09:42 +0000)
src/solver.c

index 22c9df6bab4d34a2bb76c1d51f17a0866bb97273..996fdde90d1740fcf77b1f8b10c7a7d30441cadf 100644 (file)
@@ -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;