[oe-commits] [openembedded-core] 25/33: testimage.bbclass: Use bb.fatal() instead of raising FuncFailed

git at git.openembedded.org git at git.openembedded.org
Mon Oct 3 14:50:51 UTC 2016


rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 5f8eb6726a492d259bfe25b0bbce2333c9505504
Author: Ulf Magnusson <ulfalizer at gmail.com>
AuthorDate: Sat Oct 1 04:47:10 2016 +0200

    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.
    
    Signed-off-by: Ulf Magnusson <ulfalizer at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/testimage.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index a908f92..5ddbecb 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()

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list