mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
image.bbclass: Drop support for ImageQAFailed exceptions in image_qa
After commit 905e224849fbbed1719e0add231b00e2d570b3b4 (image_qa: fix error handling), any unexpected exceptions in do_image_qa() would result in a variable being set, but never used, effectively hiding the error. Since image_qa now calls oe.qa.exit_if_errors(), remove the support for oe.utils.ImageQAFailed and instead rely on the called functions to call oe.qa.handle_error() themselves. This matches what do_package_qa() does. Also update the description of do_image_qa() to explain that the called functions are expected to call oe.qa.handle_error() themselves. [ YOCTO #15601 ] (From OE-Core rev: c00ad42b6a26ceb7a2878ed2c7f6c2821fe513cc) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0c3e111c965af2bc56533633c376b70b7fa5e1de) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
9daf5c5cf5
commit
0c02f87d31
@@ -482,19 +482,6 @@ def get_multilib_datastore(variant, d):
|
||||
localdata.setVar("MLPREFIX", "")
|
||||
return localdata
|
||||
|
||||
class ImageQAFailed(bb.BBHandledException):
|
||||
def __init__(self, description, name=None, logfile=None):
|
||||
self.description = description
|
||||
self.name = name
|
||||
self.logfile=logfile
|
||||
|
||||
def __str__(self):
|
||||
msg = 'Function failed: %s' % self.name
|
||||
if self.description:
|
||||
msg = msg + ' (%s)' % self.description
|
||||
|
||||
return msg
|
||||
|
||||
def sh_quote(string):
|
||||
import shlex
|
||||
return shlex.quote(string)
|
||||
|
||||
Reference in New Issue
Block a user