summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-13 20:09:44 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-14 12:30:50 +0000
commit229091babb144cda2dd3113a2b072d8e4414a083 (patch)
tree7917dab97ea4eb38b03b5049e1fff196baac47d0
parent4448b2a122500e3b058b6ecfc2cd591cdc788193 (diff)
downloadpoky-229091babb144cda2dd3113a2b072d8e4414a083.tar.gz
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>
-rwxr-xr-xscripts/devtool11
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/devtool b/scripts/devtool
index 219749365c..578db5a68b 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -288,11 +288,14 @@ def main():
288 scriptutils.logger_setup_color(logger, global_args.color) 288 scriptutils.logger_setup_color(logger, global_args.color)
289 289
290 if global_args.bbpath is None: 290 if global_args.bbpath is None:
291 tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
292 try: 291 try:
293 global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True) 292 tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
294 finally: 293 try:
295 tinfoil.shutdown() 294 global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True)
295 finally:
296 tinfoil.shutdown()
297 except bb.BBHandledException:
298 return 2
296 299
297 # Search BBPATH first to allow layers to override plugins in scripts_path 300 # Search BBPATH first to allow layers to override plugins in scripts_path
298 for path in global_args.bbpath.split(':') + [scripts_path]: 301 for path in global_args.bbpath.split(':') + [scripts_path]: