summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2016-10-01 04:46:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-04 16:29:04 +0100
commitfc3dc097322e6a02ec67563d05434967478bb34d (patch)
treebc0b4e2b941fa39ce46ff22cb9b10ef2f6eeab4c /meta/classes
parentc7d522c71747ebb3382db9bc609125faaa79c844 (diff)
downloadpoky-fc3dc097322e6a02ec67563d05434967478bb34d.tar.gz
package_rpm.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: f0561ba205723fd7f05c28d501c2c517034b326c) Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_rpm.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index f9398a9522..c431545f7c 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -58,7 +58,7 @@ def write_rpm_perfiledata(srcname, d):
58 try: 58 try:
59 dependsfile = open(outdepends, 'w') 59 dependsfile = open(outdepends, 'w')
60 except OSError: 60 except OSError:
61 raise bb.build.FuncFailed("unable to open spec file for writing.") 61 bb.fatal("unable to open spec file for writing")
62 62
63 dump_filerdeps('RDEPENDS', dependsfile, d) 63 dump_filerdeps('RDEPENDS', dependsfile, d)
64 64
@@ -71,7 +71,7 @@ def write_rpm_perfiledata(srcname, d):
71 try: 71 try:
72 providesfile = open(outprovides, 'w') 72 providesfile = open(outprovides, 'w')
73 except OSError: 73 except OSError:
74 raise bb.build.FuncFailed("unable to open spec file for writing.") 74 bb.fatal("unable to open spec file for writing")
75 75
76 dump_filerdeps('RPROVIDES', providesfile, d) 76 dump_filerdeps('RPROVIDES', providesfile, d)
77 77
@@ -617,7 +617,7 @@ python write_specfile () {
617 try: 617 try:
618 specfile = open(outspecfile, 'w') 618 specfile = open(outspecfile, 'w')
619 except OSError: 619 except OSError:
620 raise bb.build.FuncFailed("unable to open spec file for writing.") 620 bb.fatal("unable to open spec file for writing")
621 621
622 # RPMSPEC_PREAMBLE is a way to add arbitrary text to the top 622 # RPMSPEC_PREAMBLE is a way to add arbitrary text to the top
623 # of the generated spec file 623 # of the generated spec file