From 56be38f83415ded0484f9cb22362704e79096d28 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Sat, 1 Oct 2016 04:47:10 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes') 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): msg += " (skipped=%d)" % skipped bb.plain(msg) else: - raise bb.build.FuncFailed("%s - FAILED - check the task log and the ssh log" % pn ) + bb.fatal("%s - FAILED - check the task log and the ssh log" % pn) finally: signal.signal(signal.SIGTERM, tc.origsigtermhandler) target.stop() -- cgit v1.2.3-54-g00ecf