From 546c32753b2f0c2174c360ba83a7d2f7ffbb33f7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 31 Jul 2019 15:59:59 +0100 Subject: classes/lib: Remove bb.build.FuncFailed Whilst seemingly a good idea, this exception doesn't really serve any purpose that bb.fatal() doesn't cover. Wrapping exceptions within exceptions isn't pythonic. Its not used in many places, lets clean up those and remove usage of it entirely. It may ultimately be dropped form bitbake entirely. (From OE-Core rev: efe87ce4b2154c6f1c591ed9d8f770c229b044ad) Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 682858dc95..7fa4ff20bd 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -305,11 +305,8 @@ fakeroot python do_image_qa () { bb.build.exec_func(cmd, d) except oe.utils.ImageQAFailed as e: qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (e.name, e.description) - except bb.build.FuncFailed as e: - qamsg = qamsg + '\tImage QA function %s failed' % e.name - if e.logfile: - qamsg = qamsg + ' (log file is located at %s)' % e.logfile - qamsg = qamsg + '\n' + except Exception as e: + qamsg = qamsg + '\tImage QA function %s failed\n' % cmd if qamsg: imgname = d.getVar('IMAGE_NAME') -- cgit v1.2.3-54-g00ecf