Florian Festi 3e052f
From f1503ab6e898430b80017c0f8347860f3a74d5bb Mon Sep 17 00:00:00 2001
Florian Festi 3e052f
From: Florian Festi <ffesti@redhat.com>
Florian Festi 3e052f
Date: Mon, 11 Dec 2023 15:50:15 +0100
Florian Festi 3e052f
Subject: [PATCH] Print full path if file removal fails
Florian Festi 3e052f
Florian Festi 3e052f
For normal debug output the basename of the files are sufficient as when
Florian Festi 3e052f
debugging is enabled the directories are also printed. But here the
Florian Festi 3e052f
warning is given without a debug flag so we need the full context right
Florian Festi 3e052f
there.
Florian Festi 3e052f
---
Florian Festi 3e052f
 lib/fsm.c | 4 ++--
Florian Festi 3e052f
 1 file changed, 2 insertions(+), 2 deletions(-)
Florian Festi 3e052f
Florian Festi 3e052f
diff --git a/lib/fsm.c b/lib/fsm.c
Florian Festi 3e052f
index fcd764648..2189bd84c 100644
Florian Festi 3e052f
--- a/lib/fsm.c
Florian Festi 3e052f
+++ b/lib/fsm.c
Florian Festi 3e052f
@@ -1174,9 +1174,9 @@ int rpmPackageFilesRemove(rpmts ts, rpmte te, rpmfiles files,
Florian Festi 3e052f
 
Florian Festi 3e052f
 	    if (rc) {
Florian Festi 3e052f
 		int lvl = strict_erasures ? RPMLOG_ERR : RPMLOG_WARNING;
Florian Festi 3e052f
-		rpmlog(lvl, _("%s %s: remove failed: %s\n"),
Florian Festi 3e052f
+		rpmlog(lvl, _("%s %s%s: remove failed: %s\n"),
Florian Festi 3e052f
 			S_ISDIR(fp->sb.st_mode) ? _("directory") : _("file"),
Florian Festi 3e052f
-			fp->fpath, strerror(errno));
Florian Festi 3e052f
+			rpmfiDN(fi), fp->fpath, strerror(errno));
Florian Festi 3e052f
             }
Florian Festi 3e052f
         }
Florian Festi 3e052f
 
Florian Festi 3e052f
-- 
Florian Festi 3e052f
2.43.0
Florian Festi 3e052f