[gnome-continuous-yocto/gnomeostree-3.28-rocko: 259/8267] bitbake: cookerdata: Fix log messages and ensure we exit



commit 2fc5d5da6fc857dcb3a1ec03dd6224c2af9f41cb
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Thu May 12 08:13:04 2016 +0100

    bitbake: cookerdata: Fix log messages and ensure we exit
    
    The string formatting wasn't correct and we should exit if we hit
    errors here similar to the other exception handlers.
    
    (Bitbake rev: b90a16408a5c45ce5312384f278e19d09f8dda4d)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/cookerdata.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 50259a9..fba95af 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -192,7 +192,8 @@ def catch_parse_error(func):
                 fn, _, _, _ = traceback.extract_tb(tb, 1)[0]
                 if not fn.startswith(bbdir):
                     break
-            parselog.critical("Unable to parse %s", fn, exc_info=(exc_class, exc, tb))
+            parselog.critical("Unable to parse %s" % fn, exc_info=(exc_class, exc, tb))
+            sys.exit(1)
         except bb.parse.ParseError as exc:
             parselog.critical(str(exc))
             sys.exit(1)


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