From e01b75dff599ffa2b66e6608b28bbb3564365eee Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 13 Dec 2016 20:09:44 +1300 Subject: 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. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton --- scripts/devtool | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/devtool b/scripts/devtool index 219749365c..578db5a68b 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]: -- cgit 1.2.3-korg