[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core][dunfell 13/29] patch: Use repr() with exceptions instead of str()
From:       "Steve Sakoman" <steve () sakoman ! com>
Date:       2021-10-31 16:57:32
Message-ID: a77ad75e5addaebe3b5850361a0b3cb8dc432225.1635699172.git.steve () sakoman ! com
[Download RAW message or body]

Content-Transfer-Encoding: 8bit

From: Richard Purdie <richard.purdie@linuxfoundation.org>

This gives more meaningful errors.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5b285796b618623289992faea1282f1822335239)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 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 484d27ac76..6a19ae3e73 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'], str(exc))) +            bb.fatal("Importing \
patch '%s' with striplevel '%s'\n%s" % (parm['patchname'], parm['striplevel'], \
repr(exc)))  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, str(e))) +            bb.fatal("Applying patch '%s' on \
target directory '%s'\n%s" % (parm['patchname'], patchdir, repr(e)))  
     bb.utils.remove(process_tmpdir, True)
     del os.environ['TMPDIR']
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157671): https://lists.openembedded.org/g/openembedded-core/message/157671
Mute This Topic: https://lists.openembedded.org/mt/86721266/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-



[prev in list] [next in list] [prev in thread] [next in thread]