From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 25 Oct 2021 15:04:04 +0000 (+0100)
Subject: patch: Fix exception reporting with repr()
X-Git-Tag: uninative-3.5~1086
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=26a7012e6e17e6b4b4478a25b1b2d5608fe77cfc;p=openembedded-core.git

patch: Fix exception reporting with repr()

The exceptions generated with repre are more detailed but escaped the
newlines making them unreadable. Fix this.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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']