From: Christopher Larson <kergoth@gmail.com>
Date: Mon, 29 Jun 2015 15:20:19 +0000 (-0700)
Subject: recipetool: catch BBHandledException from parsing
X-Git-Tag: 2015-10~1099
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=22ba003f62a321c3b8405a03d6c9ee04dc0a62a6;p=openembedded-core.git

recipetool: catch BBHandledException from parsing

This ensures that we don't see a traceback on parsing failures.

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/recipetool b/scripts/recipetool
index c68bef4c96..3063cf7c43 100755
--- a/scripts/recipetool
+++ b/scripts/recipetool
@@ -82,9 +82,11 @@ def main():
 
     scriptutils.logger_setup_color(logger, args.color)
 
-    tinfoil_init(getattr(args, 'parserecipes', False))
-
-    ret = args.func(args)
+    try:
+        tinfoil_init(getattr(args, 'parserecipes', False))
+        ret = args.func(args)
+    except bb.BBHandledException:
+        ret = 1
 
     return ret