diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2024-09-26 14:25:06 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-10-29 05:51:03 -0700 |
| commit | 0c02f87d310895c79b5042efe5ade100581abb41 (patch) | |
| tree | 0c3be35ab2a58b5b2db1ef8dda8d34cab692a102 /meta/lib | |
| parent | 9daf5c5cf5abd92ece862682798c55e244e6c0be (diff) | |
| download | poky-0c02f87d310895c79b5042efe5ade100581abb41.tar.gz | |
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>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/utils.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 83f1440887..c9c7a47041 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
| @@ -482,19 +482,6 @@ def get_multilib_datastore(variant, d): | |||
| 482 | localdata.setVar("MLPREFIX", "") | 482 | localdata.setVar("MLPREFIX", "") |
| 483 | return localdata | 483 | return localdata |
| 484 | 484 | ||
| 485 | class ImageQAFailed(bb.BBHandledException): | ||
| 486 | def __init__(self, description, name=None, logfile=None): | ||
| 487 | self.description = description | ||
| 488 | self.name = name | ||
| 489 | self.logfile=logfile | ||
| 490 | |||
| 491 | def __str__(self): | ||
| 492 | msg = 'Function failed: %s' % self.name | ||
| 493 | if self.description: | ||
| 494 | msg = msg + ' (%s)' % self.description | ||
| 495 | |||
| 496 | return msg | ||
| 497 | |||
| 498 | def sh_quote(string): | 485 | def sh_quote(string): |
| 499 | import shlex | 486 | import shlex |
| 500 | return shlex.quote(string) | 487 | return shlex.quote(string) |
