[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2827/8267] license.bbclass: Use bb.fatal() instead of raising FuncFailed
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 2827/8267] license.bbclass: Use bb.fatal() instead of raising FuncFailed
- Date: Sat, 16 Dec 2017 23:46:34 +0000 (UTC)
commit 0aaa51e1e547a55886cf16b2bd4714a37f855cd7
Author: Ulf Magnusson <ulfalizer gmail com>
Date: Sat Oct 1 04:47:00 2016 +0200
license.bbclass: Use bb.fatal() instead of raising FuncFailed
This sets a good example and avoids unnecessarily contributing to
perceived complexity and cargo culting.
Motivating quote below:
< kergoth> the *original* intent was for the function/task to error via
whatever appropriate means, bb.fatal, whatever, and
funcfailed was what you'd catch if you were calling
exec_func/exec_task. that is, it's what those functions
raise, not what metadata functions should be raising
< kergoth> it didn't end up being used that way
< kergoth> but there's really never a reason to raise it yourself
FuncFailed.__init__ takes a 'name' argument rather than a 'msg'
argument, which also shows that the original purpose got lost.
(From OE-Core rev: 8e9255763674703ea16651da64fe794e5359f16e)
Signed-off-by: Ulf Magnusson <ulfalizer gmail com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/classes/license.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index ad12db4..da4fc3e 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -465,7 +465,7 @@ def find_license_files(d):
pass
if not generic_directory:
- raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config")
+ bb.fatal("COMMON_LICENSE_DIR is unset. Please set this in your distro config")
if not lic_files:
# No recipe should have an invalid license file. This is checked else
@@ -477,7 +477,7 @@ def find_license_files(d):
try:
(type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
except bb.fetch.MalformedUrl:
- raise bb.build.FuncFailed("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF',
True), url))
+ bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF', True), url))
# We want the license filename and path
chksum = parm['md5'] if 'md5' in parm else parm['sha256']
lic_chksums[path] = chksum
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]