[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5219/8267] devtool: tidy up handling of parse failures

[Emmanuele Bassi <ebassi src gnome org>]

commit 995b02b00cc04bda9b7430b16577bfddb89807b1
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Mon Mar 20 17:16:20 2017 +1300

    devtool: tidy up handling of parse failures
    
    Since the tinfoil2 refactoring, if an error occurred during parsing, we
    were showing a traceback and not correctly exiting (since we weren't
    calling shutdown()). Fix both of these issues.
    
    (From OE-Core rev: 18304036e1b513fd12c049dbf549ba75c503ed84)
    
    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/lib/devtool/__init__.py |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index 91111e1..8c385be 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -114,8 +114,15 @@ def setup_tinfoil(config_only=False, basepath=None, tracking=False):
 
         import bb.tinfoil
         tinfoil = bb.tinfoil.Tinfoil(tracking=tracking)
-        tinfoil.prepare(config_only)
-        tinfoil.logger.setLevel(logger.getEffectiveLevel())
+        try:
+            tinfoil.prepare(config_only)
+            tinfoil.logger.setLevel(logger.getEffectiveLevel())
+        except bb.tinfoil.TinfoilUIException:
+            tinfoil.shutdown()
+            raise DevtoolError('Failed to start bitbake environment')
+        except:
+            tinfoil.shutdown()
+            raise
     finally:
         os.chdir(orig_cwd)
     return tinfoil