[OE-core] [PATCH 04/22] package_rpm.bbclass: Use bb.fatal() instead of raising FuncFailed
Ulf Magnusson
ulfalizer at gmail.com
Sat Oct 1 02:46:53 UTC 2016
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.
Signed-off-by: Ulf Magnusson <ulfalizer at gmail.com>
---
meta/classes/package_rpm.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index f9398a9..c431545 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -58,7 +58,7 @@ def write_rpm_perfiledata(srcname, d):
try:
dependsfile = open(outdepends, 'w')
except OSError:
- raise bb.build.FuncFailed("unable to open spec file for writing.")
+ bb.fatal("unable to open spec file for writing")
dump_filerdeps('RDEPENDS', dependsfile, d)
@@ -71,7 +71,7 @@ def write_rpm_perfiledata(srcname, d):
try:
providesfile = open(outprovides, 'w')
except OSError:
- raise bb.build.FuncFailed("unable to open spec file for writing.")
+ bb.fatal("unable to open spec file for writing")
dump_filerdeps('RPROVIDES', providesfile, d)
@@ -617,7 +617,7 @@ python write_specfile () {
try:
specfile = open(outspecfile, 'w')
except OSError:
- raise bb.build.FuncFailed("unable to open spec file for writing.")
+ bb.fatal("unable to open spec file for writing")
# RPMSPEC_PREAMBLE is a way to add arbitrary text to the top
# of the generated spec file
--
2.7.4
More information about the Openembedded-core
mailing list