From ab29933898e8b44b59349c568516cd7a71146dac Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 May 2014 15:53:53 +0100 Subject: bitbake: cookerdata: Improve error handling If we see errors during parsing, firstly its bad to show a traceback for an expansion error so lets suppress this. Secondly, raise a BBHandledException instead of a SystemExit to show we've informed the user about the condition (printing a traceback in the default unknown case). (Bitbake rev: e01988d9a1b7c40e31161c6ce7b85c4405671068) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cookerdata.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/cookerdata.py') diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index b9b9e16675..60a6d516af 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py @@ -227,10 +227,13 @@ class CookerDataBuilder(object): try: self.parseConfigurationFiles(self.prefiles, self.postfiles) except SyntaxError: - sys.exit(1) + raise bb.BBHandledException + except bb.data_smart.ExpansionError as e: + logger.error(str(e)) + raise bb.BBHandledException except Exception: logger.exception("Error parsing configuration files") - sys.exit(1) + raise bb.BBHandledException def _findLayerConf(self, data): return findConfigFile("bblayers.conf", data) -- cgit v1.2.3-54-g00ecf