diff options
author | Ulf Magnusson <ulfalizer@gmail.com> | 2016-10-01 04:47:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-04 16:29:05 +0100 |
commit | fe7a7836edaea2fbb773ea822608fc3f8e3b84a0 (patch) | |
tree | 5413d06a0dfe5357e2fef713ec5429ad24f75641 /meta/classes/chrpath.bbclass | |
parent | 39f80cefcccd0265af0027c318b991ae109063dc (diff) | |
download | poky-fe7a7836edaea2fbb773ea822608fc3f8e3b84a0.tar.gz |
chrpath.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: 20e669f56489b2c8a9bc6a0e6f3eac81ef35445a)
Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/chrpath.bbclass')
-rw-r--r-- | meta/classes/chrpath.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index 72e8a122e3..3b5cd37f7b 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass | |||
@@ -39,8 +39,7 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d): | |||
39 | p = sub.Popen([cmd, '-r', args, fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 39 | p = sub.Popen([cmd, '-r', args, fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
40 | out, err = p.communicate() | 40 | out, err = p.communicate() |
41 | if p.returncode != 0: | 41 | if p.returncode != 0: |
42 | bb.error("%s: chrpath command failed with exit code %d:\n%s%s" % (d.getVar('PN', True), p.returncode, out, err)) | 42 | bb.fatal("%s: chrpath command failed with exit code %d:\n%s%s" % (d.getVar('PN', True), p.returncode, out, err)) |
43 | raise bb.build.FuncFailed | ||
44 | 43 | ||
45 | def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): | 44 | def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): |
46 | import subprocess as sub | 45 | import subprocess as sub |