From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Apr 2021 08:56:16 +0000 (+0000)
Subject: pakfire: Enable debugging for pool/solver
X-Git-Tag: 0.9.28~1285^2~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=943ff55c354935393fd98b0f2fac6bae69c04e1a;p=pakfire.git

pakfire: Enable debugging for pool/solver

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index a89058e10..07a9d533d 100644
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -328,8 +328,9 @@ static int pakfire_populate_pool(Pakfire pakfire) {
 	Pool* pool = pakfire->pool = pool_create();
 	pool_setdisttype(pool, DISTTYPE_RPM);
 
-#ifdef SOLVER_DEBUG
-	pool_setdebuglevel(pool, 1);
+#ifdef ENABLE_DEBUG
+	// Enable debug output
+	pool_setdebuglevel(pool, 2);
 #endif
 
 	// Set architecture of the pool
diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c
index 7f8dd33cf..b4aa299a3 100644
--- a/src/libpakfire/request.c
+++ b/src/libpakfire/request.c
@@ -25,7 +25,7 @@
 #include <solv/solver.h>
 #include <solv/transaction.h>
 
-#ifdef SOLVER_DEBUG
+#ifdef ENABLE_DEBUG
 # include <solv/solverdebug.h>
 #endif
 
@@ -147,7 +147,7 @@ static int solve(struct pakfire_request* request, Queue* queue) {
 	clock_t solving_start = clock();
 
 	if (solver_solve(request->solver, queue)) {
-#ifdef SOLVER_DEBUG
+#ifdef ENABLE_DEBUG
 		solver_printallsolutions(request->solver);
 #endif
 
@@ -160,6 +160,10 @@ static int solve(struct pakfire_request* request, Queue* queue) {
 	DEBUG(request->pakfire, "Solved request in %.4fms\n",
 		(double)(solving_end - solving_start) * 1000 / CLOCKS_PER_SEC);
 
+#ifdef ENABLE_DEBUG
+	solver_printdecisions(request->solver);
+#endif
+
 	/* If the solving process was successful, we get the transaction
 	 * from the solver. */
 	request->transaction = solver_create_transaction(request->solver);