cooker: Ensure parsing failures stop the build
PATCH 1/1 cooker: Ensure parsing failures stop the build
Currently parsing failures still allow bitbake to continue on and try and execute a build. This is clearly a bad idea and this patch adds in more correct error handling and stops the build.
The use of sys.exit is nasty but this patches other usage in this function so is at least consisent and its better than the current situation of trying to execure a half parsed set of recipes. There are probably better ways this could be improved to use to stop the build.
Signed-off-by Richard Purdie <[email protected]>
---
bitbake/lib/bb/cooker.py +9 -3
@@ -1206,9 +1206,10 @@ class BBCooker: if not self.parser.parse_next(): collectlog.debug(1, "parsing complete") - if not self.parser.error: - self.show_appends_with_no_recipes() - self.buildDepgraph() + if self.parser.error: + sys.exit(1) + self.show_appends_with_no_recipes() + self.buildDepgraph() self.state = state.running return None
@@ -1665,25 +1666,30 @@ class CookerParser(object): logger.error('Unable to parse %s: %s' % (exc.recipe, bb.exceptions.to_string(exc.realexception))) self.shutdown(clean=False) + return False except bb.parse.ParseError as exc: self.error += 1 logger.error(str(exc)) self.shutdown(clean=False) + return 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) + return False except SyntaxError as exc: self.error += 1 logger.error('Unable to parse %s', exc.recipe) self.shutdown(clean=False) + return 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)) self.shutdown(clean=False) + return False self.current += 1 self.virtuals += len(result)