From 2ca853a01ee95b3217100edc6ba769a8bddf4f1a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 25 Oct 2021 16:04:04 +0100 Subject: patch: Fix exception reporting with repr() The exceptions generated with repre are more detailed but escaped the newlines making them unreadable. Fix this. (From OE-Core rev: 26a7012e6e17e6b4b4478a25b1b2d5608fe77cfc) Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index fdf3c633bc..8de7025491 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/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))) + bb.fatal("Importing patch '%s' with striplevel '%s'\n%s" % (parm['patchname'], 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))) + bb.fatal("Applying patch '%s' on target directory '%s'\n%s" % (parm['patchname'], patchdir, repr(e).replace("\\n", "\n"))) bb.utils.remove(process_tmpdir, True) del os.environ['TMPDIR'] -- cgit v1.2.3-54-g00ecf