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



commit 4768cd65199a3ff0709b5350d1e13b85ff9a9058
Author: Ulf Magnusson <ulfalizer gmail com>
Date:   Sat Oct 1 04:47:09 2016 +0200

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

 meta/classes/utility-tasks.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index 7bc584a..7ba56e2 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -47,7 +47,7 @@ python do_checkuri() {
         fetcher = bb.fetch2.Fetch(src_uri, d)
         fetcher.checkstatus()
     except bb.fetch2.BBFetchException as e:
-        raise bb.build.FuncFailed(e)
+        bb.fatal(str(e))
 }
 
 addtask checkuriall after do_checkuri


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