diff options
author | Ulf Magnusson <ulfalizer@gmail.com> | 2016-10-01 04:47:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-04 16:29:05 +0100 |
commit | 56be38f83415ded0484f9cb22362704e79096d28 (patch) | |
tree | 2d728a86b9c7f261fdc78c389daefc0c37908840 | |
parent | 4768cd65199a3ff0709b5350d1e13b85ff9a9058 (diff) | |
download | poky-56be38f83415ded0484f9cb22362704e79096d28.tar.gz |
testimage.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: 5f8eb6726a492d259bfe25b0bbce2333c9505504)
Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/testimage.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index a908f92fee..5ddbecb356 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -164,7 +164,7 @@ def testimage_main(d): | |||
164 | msg += " (skipped=%d)" % skipped | 164 | msg += " (skipped=%d)" % skipped |
165 | bb.plain(msg) | 165 | bb.plain(msg) |
166 | else: | 166 | else: |
167 | raise bb.build.FuncFailed("%s - FAILED - check the task log and the ssh log" % pn ) | 167 | bb.fatal("%s - FAILED - check the task log and the ssh log" % pn) |
168 | finally: | 168 | finally: |
169 | signal.signal(signal.SIGTERM, tc.origsigtermhandler) | 169 | signal.signal(signal.SIGTERM, tc.origsigtermhandler) |
170 | target.stop() | 170 | target.stop() |