From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 24 Mar 2023 15:58:08 +0000 (+0000)
Subject: transaction: Show which step, action and package failed
X-Git-Tag: 0.9.29~219
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70b2918e51fcb1d9b9852acc10324853d72e3a20;p=pakfire.git

transaction: Show which step, action and package failed

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

diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index 11cd89989..160c74aaa 100644
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -829,10 +829,10 @@ static int pakfire_transaction_run_step(struct pakfire_transaction* transaction,
 		return 1;
 	}
 
-	DEBUG(transaction->pakfire, "Running %s for %s\n",
-		pakfire_action_type_string(action), pakfire_package_get_string(pkg, PAKFIRE_PKG_NEVRA));
+	const char* nevra = pakfire_package_get_string(pkg, PAKFIRE_PKG_NEVRA);
+	const enum pakfire_steps type = pakfire_transaction_get_step_type(transaction, pkg);
 
-	enum pakfire_steps type = pakfire_transaction_get_step_type(transaction, pkg);
+	DEBUG(transaction->pakfire, "Running %s for %s\n", pakfire_action_type_string(action), nevra);
 
 	int r = 0;
 	switch (action) {
@@ -999,7 +999,8 @@ static int pakfire_transaction_run_step(struct pakfire_transaction* transaction,
 	}
 
 	if (r)
-		ERROR(transaction->pakfire, "Step has failed: %s\n", strerror(r));
+		ERROR(transaction->pakfire, "Step %s (%d) for %s has failed: %m\n",
+			pakfire_action_type_string(action), type, nevra);
 
 	return r;
 }