[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2838/8267] cmake: Use bb.fatal() instead of raising FuncFailed



commit 575ee2d19e1ad4ae39413ca2fa2c0a7cd580e336
Author: Ulf Magnusson <ulfalizer gmail com>
Date:   Sat Oct 1 04:47:11 2016 +0200

    cmake: 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: ff310dd103e16a5345a4bb48090af05f50171de3)
    
    Signed-off-by: Ulf Magnusson <ulfalizer gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/cmake/cmake_3.6.1.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/cmake/cmake_3.6.1.bb b/meta/recipes-devtools/cmake/cmake_3.6.1.bb
index 67ba9c4..850d6de 100644
--- a/meta/recipes-devtools/cmake/cmake_3.6.1.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.6.1.bb
@@ -14,7 +14,7 @@ python () {
     docdir=d.getVar("docdir", True)
 
     if not docdir.startswith(prefix):
-        raise bb.build.FuncFailed('docdir must contain prefix as its prefix')
+        bb.fatal('docdir must contain prefix as its prefix')
 
     docdir_stripped = docdir[len(prefix):]
     if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]