[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3755/8267] devtool: prevent BBHandledException from showing traceback

[Emmanuele Bassi <ebassi src gnome org>]

commit 229091babb144cda2dd3113a2b072d8e4414a083
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Tue Dec 13 20:09:44 2016 +1300

    devtool: prevent BBHandledException from showing traceback
    
    If we don't catch this then attempting to run devtool in non-memres mode
    when bitbake is already running will produce a traceback instead of just
    an error message.
    
    (From OE-Core rev: e01b75dff599ffa2b66e6608b28bbb3564365eee)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/devtool |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/scripts/devtool b/scripts/devtool
index 2197493..578db5a 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -288,11 +288,14 @@ def main():
     scriptutils.logger_setup_color(logger, global_args.color)
 
     if global_args.bbpath is None:
-        tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
         try:
-            global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True)
-        finally:
-            tinfoil.shutdown()
+            tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
+            try:
+                global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True)
+            finally:
+                tinfoil.shutdown()
+        except bb.BBHandledException:
+            return 2
 
     # Search BBPATH first to allow layers to override plugins in scripts_path
     for path in global_args.bbpath.split(':') + [scripts_path]: