diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-12-13 20:09:44 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-14 12:30:50 +0000 |
| commit | 229091babb144cda2dd3113a2b072d8e4414a083 (patch) | |
| tree | 7917dab97ea4eb38b03b5049e1fff196baac47d0 /scripts | |
| parent | 4448b2a122500e3b058b6ecfc2cd591cdc788193 (diff) | |
| download | openembedded-core-contrib-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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/devtool | 11 |
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(): 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]: |