diff options
author | Christopher Larson <kergoth@gmail.com> | 2015-06-29 08:20:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-27 23:29:12 +0100 |
commit | e28c4ba7bf7c35682c8fe98657b41e3041c4794b (patch) | |
tree | 30b40ed65a5e6f1344bd91fb5f128ff1faf0e699 | |
parent | 813c417f266183e626d3437904943f8545be0eeb (diff) | |
download | poky-e28c4ba7bf7c35682c8fe98657b41e3041c4794b.tar.gz |
recipetool: catch BBHandledException from parsing
This ensures that we don't see a traceback on parsing failures.
(From OE-Core rev: 22ba003f62a321c3b8405a03d6c9ee04dc0a62a6)
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/recipetool | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/recipetool b/scripts/recipetool index c68bef4c96..3063cf7c43 100755 --- a/scripts/recipetool +++ b/scripts/recipetool | |||
@@ -82,9 +82,11 @@ def main(): | |||
82 | 82 | ||
83 | scriptutils.logger_setup_color(logger, args.color) | 83 | scriptutils.logger_setup_color(logger, args.color) |
84 | 84 | ||
85 | tinfoil_init(getattr(args, 'parserecipes', False)) | 85 | try: |
86 | 86 | tinfoil_init(getattr(args, 'parserecipes', False)) | |
87 | ret = args.func(args) | 87 | ret = args.func(args) |
88 | except bb.BBHandledException: | ||
89 | ret = 1 | ||
88 | 90 | ||
89 | return ret | 91 | return ret |
90 | 92 | ||