Author: mlschroe Date: Wed Nov 5 16:20:24 2008 New Revision: 11581 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11581&view=rev Log: - fix probsolved logic Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=11581&r1=11580&r2=11581&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Nov 5 16:20:24 2008 @@ -3219,9 +3219,11 @@ } if (v < 0 && (job->elements[-v - 1] & SOLVER_ESSENTIAL)) { - /* essential job, skip if we already have a solution */ - if (probsolved) + /* essential job, skip if we already have a non-essential + solution */ + if (probsolved > 0) continue; + probsolved = -1; /* show all solutions */ } refine_suggestion(solv, job, problem, v, &solution); if (!solution.count) @@ -3289,7 +3291,8 @@ /* mark end of this solution */ if (nsol) { - probsolved = 1; + if (!probsolved) + probsolved = 1; queue_push(&solutions, 0); queue_push(&solutions, 0); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org