ref: refs/heads/master
commit 3afc12d3eb27458a64e8957477fa252d450e3da7
Author: Michael Schroeder
Date: Thu Jun 4 18:53:43 2009 +0200
- fix bugs in problem handling
---
src/problems.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/problems.c b/src/problems.c
index f76a761..bed7303 100644
--- a/src/problems.c
+++ b/src/problems.c
@@ -392,7 +392,7 @@ convertsolution(Solver *solv, Id why, Queue *solutionq)
break;
}
if (!p)
- p = -solv->rules[why].p; /* XXX: what to do here? */
+ return; /* false alarm */
queue_push(solutionq, SOLVER_SOLUTION_INFARCH);
queue_push(solutionq, p);
return;
@@ -413,7 +413,7 @@ convertsolution(Solver *solv, Id why, Queue *solutionq)
break;
}
if (!p)
- p = -solv->rules[why].p; /* XXX: what to do here? */
+ return; /* false alarm */
queue_push(solutionq, SOLVER_SOLUTION_DISTUPGRADE);
queue_push(solutionq, p);
return;
@@ -565,7 +565,7 @@ create_solutions(Solver *solv, int probnr, int solidx)
if (solv->solutions.count == solstart + 1)
{
solv->solutions.count--;
- if (!essentialok && i + 1 == problem.count)
+ if (!essentialok && i + 1 == problem.count && !nsol)
{
/* nothing found, start over */
essentialok = 1;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
