diff options
| author |   Ulf Magnusson <ulfalizer@gmail.com> | 2016-10-01 04:46:55 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-03 15:46:21 +0100 |
| commit | 48c4faa1d7117732974e51428f7ed2f62ad7e7bf (patch) | |
| tree | c1ec0857025d69d145f4193c82acd9cd631ba8dd /meta | |
| parent | e507cb978fd52164beb28324933cb3d5e368c3ab (diff) | |
| download | openembedded-core-contrib-48c4faa1d7117732974e51428f7ed2f62ad7e7bf.tar.gz | |
grub-efi.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/grub-efi.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 26ba8cefcb..17417ba5d9 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -90,12 +90,12 @@ python build_efi_cfg() { cfile = d.getVar('GRUB_CFG', True) if not cfile: - raise bb.build.FuncFailed('Unable to read GRUB_CFG') + bb.fatal('Unable to read GRUB_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') @@ -114,7 +114,7 @@ python build_efi_cfg() { root = d.getVar('GRUB_ROOT', True) if not root: - raise bb.build.FuncFailed('GRUB_ROOT not defined') + bb.fatal('GRUB_ROOT not defined') if gfxserial == "1": btypes = [ [ " graphics console", "" ], @@ -127,7 +127,7 @@ python build_efi_cfg() { overrides = localdata.getVar('OVERRIDES', True) if not overrides: - raise bb.build.FuncFailed('OVERRIDES not defined') + bb.fatal('OVERRIDES not defined') for btype in btypes: localdata.setVar('OVERRIDES', label + ':' + overrides) |