diff options
author | Mike Crowe <mac@mcrowe.com> | 2021-10-15 15:39:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-17 11:56:32 +0100 |
commit | 51b1611e204b32b3e65176ef86d4562e2f330835 (patch) | |
tree | 7845a123d2eddbc2c9d5f9f72e1c2be9c2dea730 /meta/classes/buildhistory.bbclass | |
parent | 25675706b6339b6a11e69dbad1c885a4b79fc57c (diff) | |
download | poky-51b1611e204b32b3e65176ef86d4562e2f330835.tar.gz |
lib/oe/qa,insane: Move extra error handling functions to library
Extract package_qa_write_error, package_qa_handle_error and
package_qa_add_message functions from insane.bbclass to lib/oe/qa.py and
drop the package_qa_ prefixes.
Update various bbclasses to use the new functions. No import is required
since base.bbclass puts oe.qa in OE_IMPORTS.
Stop requiring callers to manually track whether a fatal error has been
encountered via a "sane" flag. Instead replace the QA_SANE variable with
QA_ERRORS_FOUND and call oe.qa.exit_if_errors or
oe.qa.exit_with_message_if_errors at the end of each task.
Inspired by discussion resulting from
https://lists.openembedded.org/g/openembedded-core/message/156793 and
https://lists.openembedded.org/g/openembedded-core/message/156900
(From OE-Core rev: f0ad152ef4cc15c042bc9eeefb6af096d054b220)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 7c44fec2d1..62d0d781a1 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -287,7 +287,7 @@ python buildhistory_emit_pkghistory() { | |||
287 | r = bb.utils.vercmp((pkge, pkgv, pkgr), (last_pkge, last_pkgv, last_pkgr)) | 287 | r = bb.utils.vercmp((pkge, pkgv, pkgr), (last_pkge, last_pkgv, last_pkgr)) |
288 | if r < 0: | 288 | if r < 0: |
289 | msg = "Package version for package %s went backwards which would break package feeds (from %s:%s-%s to %s:%s-%s)" % (pkg, last_pkge, last_pkgv, last_pkgr, pkge, pkgv, pkgr) | 289 | msg = "Package version for package %s went backwards which would break package feeds (from %s:%s-%s to %s:%s-%s)" % (pkg, last_pkge, last_pkgv, last_pkgr, pkge, pkgv, pkgr) |
290 | package_qa_handle_error("version-going-backwards", msg, d) | 290 | oe.qa.handle_error("version-going-backwards", msg, d) |
291 | 291 | ||
292 | pkginfo = PackageInfo(pkg) | 292 | pkginfo = PackageInfo(pkg) |
293 | # Apparently the version can be different on a per-package basis (see Python) | 293 | # Apparently the version can be different on a per-package basis (see Python) |
@@ -321,6 +321,7 @@ python buildhistory_emit_pkghistory() { | |||
321 | 321 | ||
322 | # Create files-in-<package-name>.txt files containing a list of files of each recipe's package | 322 | # Create files-in-<package-name>.txt files containing a list of files of each recipe's package |
323 | bb.build.exec_func("buildhistory_list_pkg_files", d) | 323 | bb.build.exec_func("buildhistory_list_pkg_files", d) |
324 | oe.qa.exit_if_errors(d) | ||
324 | } | 325 | } |
325 | 326 | ||
326 | python buildhistory_emit_outputsigs() { | 327 | python buildhistory_emit_outputsigs() { |