mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

patch: Fix exception reporting with repr()

Browse Source 
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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-10-25 16:04:04 +01:00
parent c2bbcd4158
commit 2ca853a01e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/patch.bbclass
+2 -2
View File
@@ -150,12 +150,12 @@ python patch_do_patch() {
patchset.Import({"file":local, "strippath": parm['striplevel']}, True) patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
except Exception as exc: except Exception as exc:
bb.utils.remove(process_tmpdir, True) 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: try:
resolver.Resolve() resolver.Resolve()
except bb.BBHandledException as e: except bb.BBHandledException as e:
bb.utils.remove(process_tmpdir, True) 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) bb.utils.remove(process_tmpdir, True)
del os.environ['TMPDIR'] del os.environ['TMPDIR']