diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2016-10-01 04:46:57 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-03 15:46:21 +0100 |
| commit | c61d7a01c89f0d25d069191cc47d6768bee2ce48 (patch) | |
| tree | 66719e424dfcaeb86dbf9db80370190a4f0287cc /meta | |
| parent | cca772ecf0adafbd767974add27ada125aae5269 (diff) | |
| download | openembedded-core-c61d7a01c89f0d25d069191cc47d6768bee2ce48.tar.gz openembedded-core-c61d7a01c89f0d25d069191cc47d6768bee2ce48.tar.bz2 openembedded-core-c61d7a01c89f0d25d069191cc47d6768bee2ce48.zip | |
systemd-boot.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')
| -rw-r--r-- | meta/classes/systemd-boot.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass index b550b61a7c..05244c7e50 100644 --- a/meta/classes/systemd-boot.bbclass +++ b/meta/classes/systemd-boot.bbclass @@ -77,7 +77,7 @@ python build_efi_cfg() { try: cfgfile = open(cfile, 'w') except OSError: - raise bb.build.FuncFailed('Unable to open %s' % (cfile)) + bb.fatal('Unable to open %s' % cfile) cfgfile.write('# Automatically created by OE\n') cfgfile.write('default %s\n' % (labels.split()[0])) @@ -93,14 +93,14 @@ python build_efi_cfg() { overrides = localdata.getVar('OVERRIDES', True) if not overrides: - raise bb.build.FuncFailed('OVERRIDES not defined') + bb.fatal('OVERRIDES not defined') entryfile = "%s/%s.conf" % (s, label) d.appendVar("SYSTEMD_BOOT_ENTRIES", " " + entryfile) try: entrycfg = open(entryfile, "w") except OSError: - raise bb.build.FuncFailed('Unable to open %s' % (entryfile)) + bb.fatal('Unable to open %s' % entryfile) localdata.setVar('OVERRIDES', label + ':' + overrides) bb.data.update_data(localdata) |