ref: refs/heads/master commit 0957c5406b4fed11fa1143d9e382226596476ed0 Author: Michael Schroeder Date: Sat Jun 20 14:39:52 2009 +0200 - make debug output better --- tools/findfileconflicts.c | 5 +++++ tools/pool_fileconflicts.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/findfileconflicts.c b/tools/findfileconflicts.c index 4bd41d6..a7286ab 100644 --- a/tools/findfileconflicts.c +++ b/tools/findfileconflicts.c @@ -61,9 +61,14 @@ int main() pool_setdebuglevel(pool, 0); Solver *solv = solver_create(pool); solv->fixsystem = 1; +#if 0 + solv->allowuninstall = 1; +#endif solver_solve(solv, &job); if (solv->problems.count) solver_printallsolutions(solv); + else + solver_printtransaction(solv); queue_free(&job); solver_free(solv); } diff --git a/tools/pool_fileconflicts.c b/tools/pool_fileconflicts.c index 8e48d32..e14d5c4 100644 --- a/tools/pool_fileconflicts.c +++ b/tools/pool_fileconflicts.c @@ -261,6 +261,7 @@ pool_findfileconflicts(Pool *pool, Queue *pkgs, int cutoff, Queue *conflicts, vo return 0; now = start = sat_timems(0); + POOL_DEBUG(SAT_DEBUG_STATS, "searching for file conflicts\n"); POOL_DEBUG(SAT_DEBUG_STATS, "packages: %d, cutoff %d\n", pkgs->count, cutoff); memset(&cbdata, 0, sizeof(cbdata)); @@ -396,7 +397,8 @@ pool_findfileconflicts(Pool *pool, Queue *pkgs, int cutoff, Queue *conflicts, vo if (conflicts->count > 5) sat_sort(conflicts->elements, conflicts->count / 5, 5 * sizeof(Id), conflicts_cmp, pool); (*handle_cb)(pool, 0, handle_cbdata); - POOL_DEBUG(SAT_DEBUG_STATS, "conflict detection took %d ms\n", sat_timems(start)); + POOL_DEBUG(SAT_DEBUG_STATS, "found %d file conflicts\n", conflicts->count / 5); + POOL_DEBUG(SAT_DEBUG_STATS, "file conflict detection took %d ms\n", sat_timems(start)); return conflicts->count; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org