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



commit db6ae5254408a1a8266d56b95fb02235794e46ce
Author: Ulf Magnusson <ulfalizer gmail com>
Date:   Sat Oct 1 04:47:03 2016 +0200

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

 meta/classes/useradd.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index bf62ada..3cff08e 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -171,7 +171,7 @@ def update_useradd_after_parse(d):
     useradd_packages = d.getVar('USERADD_PACKAGES', True)
 
     if not useradd_packages:
-        raise bb.build.FuncFailed("%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE', 
False))
+        bb.fatal("%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE', False))
 
     for pkg in useradd_packages.split():
         if not d.getVar('USERADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPADD_PARAM_%s' % pkg, True) 
and not d.getVar('GROUPMEMS_PARAM_%s' % pkg, True):


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