]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate.bbclass: Use bb.fatal() instead of raising FuncFailed
authorUlf Magnusson <ulfalizer@gmail.com>
Sat, 1 Oct 2016 02:47:04 +0000 (04:47 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 3 Oct 2016 14:46:21 +0000 (15:46 +0100)
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.

Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/sstate.bbclass

index ac9d77d52832f6c72a553fdcdc296369a1ba492d..6f0c791fe5065dcf50bfb72b8cf3153d9d60ed68 100644 (file)
@@ -658,7 +658,7 @@ def sstate_setscene(d):
     shared_state = sstate_state_fromvars(d)
     accelerate = sstate_installpkg(shared_state, d)
     if not accelerate:
-        raise bb.build.FuncFailed("No suitable staging package found")
+        bb.fatal("No suitable staging package found")
 
 python sstate_task_prefunc () {
     shared_state = sstate_state_fromvars(d)