diff options
author | Ulf Magnusson <ulfalizer@gmail.com> | 2016-10-01 04:46:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-04 16:29:04 +0100 |
commit | 7f22c97be34dca5843b49cfcc1e0875f1b2a10e6 (patch) | |
tree | a71b72b8683397ed59739d0a3afb043cfb20ff8b /meta/classes/update-rc.d.bbclass | |
parent | f13bd4b8e4202e29ce83ed842bb54b28a63c2d70 (diff) | |
download | poky-7f22c97be34dca5843b49cfcc1e0875f1b2a10e6.tar.gz |
update-rc.d.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: a77b4e543407eee133fbd38ac9b69e90bea541e0)
Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/update-rc.d.bbclass')
-rw-r--r-- | meta/classes/update-rc.d.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 82b80245d4..dfef2a2fd6 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
@@ -57,9 +57,9 @@ fi | |||
57 | def update_rc_after_parse(d): | 57 | def update_rc_after_parse(d): |
58 | if d.getVar('INITSCRIPT_PACKAGES', False) == None: | 58 | if d.getVar('INITSCRIPT_PACKAGES', False) == None: |
59 | if d.getVar('INITSCRIPT_NAME', False) == None: | 59 | if d.getVar('INITSCRIPT_NAME', False) == None: |
60 | raise bb.build.FuncFailed("%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % d.getVar('FILE', False)) | 60 | bb.fatal("%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % d.getVar('FILE', False)) |
61 | if d.getVar('INITSCRIPT_PARAMS', False) == None: | 61 | if d.getVar('INITSCRIPT_PARAMS', False) == None: |
62 | raise bb.build.FuncFailed("%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % d.getVar('FILE', False)) | 62 | bb.fatal("%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % d.getVar('FILE', False)) |
63 | 63 | ||
64 | python __anonymous() { | 64 | python __anonymous() { |
65 | update_rc_after_parse(d) | 65 | update_rc_after_parse(d) |