diff options
| author |   Ulf Magnusson <ulfalizer@gmail.com> | 2016-10-01 04:46:51 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-03 15:46:21 +0100 |
| commit | 01e3ac73860a24710852383a15bb5d01db13de57 (patch) | |
| tree | 16af53c21612a877a4bc78496a8a7237e045d2af /meta/classes | |
| parent | 9635af9785509a39c1ac2509740d46276119a0ca (diff) | |
| download | openembedded-core-contrib-01e3ac73860a24710852383a15bb5d01db13de57.tar.gz | |
package_ipk.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.
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_ipk.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 930e154bd7..eb00932336 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -108,7 +108,7 @@ python do_package_ipk () { ctrlfile = open(os.path.join(controldir, 'control'), 'w') except OSError: bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("unable to open control file for writing.") + bb.fatal("unable to open control file for writing") fields = [] pe = d.getVar('PKGE', True) @@ -162,7 +162,7 @@ python do_package_ipk () { (type, value, traceback) = sys.exc_info() ctrlfile.close() bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value) + bb.fatal("Missing field for ipk generation: %s" % value) # more fields custom_fields_chunk = get_package_additional_metadata("ipk", localdata) @@ -226,7 +226,7 @@ python do_package_ipk () { scriptfile = open(os.path.join(controldir, script), 'w') except OSError: bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("unable to open %s script file for writing." % script) + bb.fatal("unable to open %s script file for writing" % script) scriptfile.write(scriptvar) scriptfile.close() os.chmod(os.path.join(controldir, script), 0o755) @@ -237,7 +237,7 @@ python do_package_ipk () { conffiles = open(os.path.join(controldir, 'conffiles'), 'w') except OSError: bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("unable to open conffiles for writing.") + bb.fatal("unable to open conffiles for writing") for f in conffiles_str.split(): if os.path.exists(oe.path.join(root, f)): conffiles.write('%s\n' % f) @@ -248,7 +248,7 @@ python do_package_ipk () { d.getVar("OPKGBUILDCMD", True), pkg, pkgoutdir), shell=True) if ret != 0: bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("opkg-build execution failed") + bb.fatal("opkg-build execution failed") if d.getVar('IPK_SIGN_PACKAGES', True) == '1': ipkver = "%s-%s" % (d.getVar('PKGV', True), d.getVar('PKGR', True)) |