diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-12 08:13:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:41:32 +0100 |
commit | 2fc5d5da6fc857dcb3a1ec03dd6224c2af9f41cb (patch) | |
tree | 67740a2cbf7079deb6102eca0c1f9f25a9ff1b0d /bitbake | |
parent | a46d485856f25df569ca964e50640efa5919aed9 (diff) | |
download | poky-2fc5d5da6fc857dcb3a1ec03dd6224c2af9f41cb.tar.gz |
bitbake: cookerdata: Fix log messages and ensure we exit
The string formatting wasn't correct and we should exit if we hit
errors here similar to the other exception handlers.
(Bitbake rev: b90a16408a5c45ce5312384f278e19d09f8dda4d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cookerdata.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index 50259a9a07..fba95afa54 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
@@ -192,7 +192,8 @@ def catch_parse_error(func): | |||
192 | fn, _, _, _ = traceback.extract_tb(tb, 1)[0] | 192 | fn, _, _, _ = traceback.extract_tb(tb, 1)[0] |
193 | if not fn.startswith(bbdir): | 193 | if not fn.startswith(bbdir): |
194 | break | 194 | break |
195 | parselog.critical("Unable to parse %s", fn, exc_info=(exc_class, exc, tb)) | 195 | parselog.critical("Unable to parse %s" % fn, exc_info=(exc_class, exc, tb)) |
196 | sys.exit(1) | ||
196 | except bb.parse.ParseError as exc: | 197 | except bb.parse.ParseError as exc: |
197 | parselog.critical(str(exc)) | 198 | parselog.critical(str(exc)) |
198 | sys.exit(1) | 199 | sys.exit(1) |