Author: mlschroe Date: Thu Oct 30 12:44:38 2008 New Revision: 11547 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11547&view=rev Log: - also disable update rules for "keep installed" jobs. 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=11547&r1=11546&r2=11547&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Oct 30 12:44:38 2008 @@ -914,7 +914,10 @@ if (solv->noobsoletes.size && MAPTST(&solv->noobsoletes, what)) break; if (s->repo == installed) - break; + { + MAPSET(&solv->noupdate, what - installed->start); + break; + } if (s->obsoletes) { Id obs, *obsp; @@ -962,7 +965,18 @@ break; s = pool->solvables + what; if (s->repo == installed) - break; + { + r = solv->rules + solv->updaterules + (what - installed->start); + if (r->d >= 0) + break; + enablerule(solv, r); + IF_POOLDEBUG (SAT_DEBUG_SOLUTIONS) + { + POOL_DEBUG(SAT_DEBUG_SOLUTIONS, "@@@ re-enabling "); + solver_printrule(solv, SAT_DEBUG_SOLUTIONS, r); + } + break; + } if (s->obsoletes) { Id obs, *obsp; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org