diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-23 16:26:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-24 10:13:00 +0100 |
commit | 358952f0d874b869d361bbd72a5ea317bf939cd3 (patch) | |
tree | e44fc2fed42567dfd987a166ba36453143c5aa8e /lib/bb/cooker.py | |
parent | befbb5c9428eaf98b2ff9c4b36b0b3f2dce7fe07 (diff) | |
download | bitbake-358952f0d874b869d361bbd72a5ea317bf939cd3.tar.gz |
cooker.py: Ensure we track parser errors and only show bbappend issues on complete parse
Currently if any parsing failure occurs, there can be a long list of
bbappends that are "dangling" based on the fact that recipes were not
parsed. This change firstly ensures the error counter is incremented
and secondly that the bbappends list is only shown on a completed
parse list.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/cooker.py')
-rw-r--r-- | lib/bb/cooker.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 361bc88a9..5d01af31a 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1205,8 +1205,9 @@ class BBCooker: if not self.parser.parse_next(): collectlog.debug(1, "parsing complete") - self.show_appends_with_no_recipes() - self.buildDepgraph() + if not self.parser.error: + self.show_appends_with_no_recipes() + self.buildDepgraph() self.state = state.running return None @@ -1601,6 +1602,7 @@ class CookerParser(object): self.skipped, self.masked, self.virtuals, self.error, self.total) + bb.event.fire(event, self.cfgdata) self.feeder_quit.put(None) for process in self.processes: @@ -1658,20 +1660,25 @@ class CookerParser(object): self.shutdown() return False except ParsingFailure as exc: + self.error += 1 logger.error('Unable to parse %s: %s' % (exc.recipe, bb.exceptions.to_string(exc.realexception))) self.shutdown(clean=False) except bb.parse.ParseError as exc: + self.error += 1 logger.error(str(exc)) self.shutdown(clean=False) except bb.data_smart.ExpansionError as exc: + self.error += 1 _, value, _ = sys.exc_info() logger.error('ExpansionError during parsing %s: %s', value.recipe, str(exc)) self.shutdown(clean=False) except SyntaxError as exc: + self.error += 1 logger.error('Unable to parse %s', exc.recipe) self.shutdown(clean=False) except Exception as exc: + self.error += 1 etype, value, tb = sys.exc_info() logger.error('Unable to parse %s', value.recipe, exc_info=(etype, value, exc.traceback)) |