Author: mlschroe Date: Fri Apr 11 18:51:41 2008 New Revision: 9549 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9549&view=rev Log: - change schubi debugging - add some comments to internal create_decisions_obsoletesmap() function. should really make it static, as all uses in applayer code are broken. I hope nobody uses the applayer. 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=9549&r1=9548&r2=9549&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri Apr 11 18:51:41 2008 @@ -2829,6 +2829,12 @@ /* * create obsoletesmap from solver decisions * required for decision handling + * + * for solvables in installed repo: + * 0 - not obsoleted + * p - one of the packages that obsolete us + * for all others: + * n - number of packages this package obsoletes */ Id * @@ -2908,7 +2914,16 @@ int i; Solvable *s; - POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- Decisions -----\n"); + IF_POOLDEBUG (SAT_DEBUG_SCHUBI) + { + POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- Decisions -----\n"); + for (i = 0; i < solv->decisionq.count; i++) + { + p = solv->decisionq.elements[i]; + printruleelement(solv, SAT_DEBUG_SCHUBI, 0, p); + } + POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- Decisions end -----\n"); + } /* print solvables to be erased */ @@ -2931,20 +2946,9 @@ int j; p = solv->decisionq.elements[i]; if (p < 0) - { - IF_POOLDEBUG (SAT_DEBUG_SCHUBI) - { - p = -p; - s = pool->solvables + p; - POOL_DEBUG(SAT_DEBUG_SCHUBI, "level of %s is %d\n", solvable2str(pool, s), p); - } - continue; - } + continue; if (p == SYSTEMSOLVABLE) - { - POOL_DEBUG(SAT_DEBUG_SCHUBI, "SYSTEMSOLVABLE\n"); - continue; - } + continue; s = pool->solvables + p; if (installed && s->repo == installed) continue; @@ -2986,7 +2990,6 @@ POOL_DEBUG(SAT_DEBUG_RESULT, "- %s\n", solvable2str(pool, s)); } } - POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- Decisions end -----\n"); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org