From: Michael Schroeder <mls@suse.de>
Date: Sat, 20 Jun 2009 12:39:52 +0000 (+0200)
Subject: - make debug output better
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~243
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43353e371d8e6025f418da40070e435737db3fee;p=thirdparty%2Flibsolv.git

- make debug output better
---

diff --git a/tools/findfileconflicts.c b/tools/findfileconflicts.c
index 4bd41d63..a7286aba 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 8e48d325..e14d5c4b 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;
 }