diff mbox series

patch.bbclass: Show full path when a patch fails to apply

Message ID 20260107114649.3874373-1-pkj@axis.com
State Under Review
Headers show
Series patch.bbclass: Show full path when a patch fails to apply | expand

Commit Message

Peter Kjellerstedt Jan. 7, 2026, 11:46 a.m. UTC 
If a patch fails to apply, it helps to know the full path to it. This is
especially true if multiple versions of the patch exists, e.g., due to
overrides via bbappends.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 meta/classes-global/patch.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes-global/patch.bbclass b/meta/classes-global/patch.bbclass
index e5786b1c9a..2d9b39c9a5 100644
--- a/meta/classes-global/patch.bbclass
+++ b/meta/classes-global/patch.bbclass
@@ -150,12 +150,12 @@  python patch_do_patch() {
             patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
         except Exception as exc:
             bb.utils.remove(process_tmpdir, True)
-            bb.fatal("Importing patch '%s' with striplevel '%s'\n%s" % (parm['patchname'], parm['striplevel'], repr(exc).replace("\\n", "\n")))
+            bb.fatal("Importing patch '%s' with striplevel '%s'\n%s" % (local, parm['striplevel'], repr(exc).replace("\\n", "\n")))
         try:
             resolver.Resolve()
         except bb.BBHandledException as e:
             bb.utils.remove(process_tmpdir, True)
-            bb.fatal("Applying patch '%s' on target directory '%s'\n%s" % (parm['patchname'], patchdir, repr(e).replace("\\n", "\n")))
+            bb.fatal("Applying patch '%s' on target directory '%s'\n%s" % (local, patchdir, repr(e).replace("\\n", "\n")))
 
     bb.utils.remove(process_tmpdir, True)
     del os.environ['TMPDIR']