From fc3dc097322e6a02ec67563d05434967478bb34d Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Sat, 1 Oct 2016 04:46:53 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes') 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): 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 -- cgit v1.2.3-54-g00ecf