diff options
author | Ulf Magnusson <ulfalizer@gmail.com> | 2016-10-01 04:47:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-04 16:29:04 +0100 |
commit | 823acf80373852cbc5a26807165ffbcc397b0a3d (patch) | |
tree | 6ee4ab3ecf29895ca5af3467dd9f43efcd4ecfc3 /meta | |
parent | 0aaa51e1e547a55886cf16b2bd4714a37f855cd7 (diff) | |
download | poky-823acf80373852cbc5a26807165ffbcc397b0a3d.tar.gz |
systemd.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: 8e956d66087b9c41591b8e4e817ed6c9e42f5981)
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.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index db7873fbe2..d56c760a17 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass | |||
@@ -165,8 +165,7 @@ python systemd_populate_packages() { | |||
165 | if path_found != '': | 165 | if path_found != '': |
166 | systemd_add_files_and_parse(pkg_systemd, path_found, service, keys) | 166 | systemd_add_files_and_parse(pkg_systemd, path_found, service, keys) |
167 | else: | 167 | else: |
168 | raise bb.build.FuncFailed("SYSTEMD_SERVICE_%s value %s does not exist" % \ | 168 | bb.fatal("SYSTEMD_SERVICE_%s value %s does not exist" % (pkg_systemd, service)) |
169 | (pkg_systemd, service)) | ||
170 | 169 | ||
171 | # Run all modifications once when creating package | 170 | # Run all modifications once when creating package |
172 | if os.path.exists(d.getVar("D", True)): | 171 | if os.path.exists(d.getVar("D", True)): |