[oe-commits] [openembedded-core] 16/18: devtool: prevent BBHandledException from showing traceback
git at git.openembedded.org
git at git.openembedded.org
Wed Dec 14 09:57:30 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit e01b75dff599ffa2b66e6608b28bbb3564365eee
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Tue Dec 13 20:09:44 2016 +1300
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 <paul.eggleton at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
scripts/devtool | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/scripts/devtool b/scripts/devtool
index 2197493..578db5a 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]:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list