summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2016-10-01 04:47:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-04 16:29:04 +0100
commit0aaa51e1e547a55886cf16b2bd4714a37f855cd7 (patch)
treec58962c83c64b18bdf664ae6c1351efe2013c945 /meta
parent7f22c97be34dca5843b49cfcc1e0875f1b2a10e6 (diff)
downloadpoky-0aaa51e1e547a55886cf16b2bd4714a37f855cd7.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index ad12db4838..da4fc3e1d4 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -465,7 +465,7 @@ def find_license_files(d):
465 pass 465 pass
466 466
467 if not generic_directory: 467 if not generic_directory:
468 raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config") 468 bb.fatal("COMMON_LICENSE_DIR is unset. Please set this in your distro config")
469 469
470 if not lic_files: 470 if not lic_files:
471 # No recipe should have an invalid license file. This is checked else 471 # No recipe should have an invalid license file. This is checked else
@@ -477,7 +477,7 @@ def find_license_files(d):
477 try: 477 try:
478 (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url) 478 (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
479 except bb.fetch.MalformedUrl: 479 except bb.fetch.MalformedUrl:
480 raise bb.build.FuncFailed("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF', True), url)) 480 bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF', True), url))
481 # We want the license filename and path 481 # We want the license filename and path
482 chksum = parm['md5'] if 'md5' in parm else parm['sha256'] 482 chksum = parm['md5'] if 'md5' in parm else parm['sha256']
483 lic_chksums[path] = chksum 483 lic_chksums[path] = chksum