mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:19:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

syslinux.bbclass: Use bb.fatal() instead of raising FuncFailed

Browse Source 
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: cca772ecf0adafbd767974add27ada125aae5269)

Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ulf Magnusson
2016-10-01 04:46:56 +02:00
committed by Richard Purdie
parent 103ab2d810
commit 46398106ef
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/classes/syslinux.bbclass
View File

@@ -100,12 +100,12 @@ python build_syslinux_cfg () {
cfile = d.getVar('SYSLINUX_CFG', True)
if not cfile:
raise bb.build.FuncFailed('Unable to read SYSLINUX_CFG')
bb.fatal('Unable to read SYSLINUX_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')
@@ -160,7 +160,7 @@ python build_syslinux_cfg () {
overrides = localdata.getVar('OVERRIDES', True)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
bb.fatal('OVERRIDES not defined')
localdata.setVar('OVERRIDES', label + ':' + overrides)
bb.data.update_data(localdata)
@@ -172,7 +172,7 @@ python build_syslinux_cfg () {
root= d.getVar('SYSLINUX_ROOT', True)
if not root:
raise bb.build.FuncFailed('SYSLINUX_ROOT not defined')
bb.fatal('SYSLINUX_ROOT not defined')
for btype in btypes:
cfgfile.write('LABEL %s%s\nKERNEL /vmlinuz\n' % (btype[0], label))