From 36d1dcef6566e601d6b38a420b4e8103474cf018 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 5 May 2011 16:50:34 -0700 Subject: cooker: show a useful message for ParsingFailure (Bitbake rev: a41c217c6e9195f8b9ea2de6e1d335b10b904558) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/cooker.py') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index fab65c22d5..ef42f02dab 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -33,7 +33,7 @@ import sre_constants import threading from cStringIO import StringIO from contextlib import closing -import bb +import bb, bb.exceptions from bb import utils, data, parse, event, cache, providers, taskdata, command, runqueue logger = logging.getLogger("BitBake") @@ -1122,8 +1122,7 @@ class ParsingFailure(Exception): def __init__(self, realexception, recipe): self.realexception = realexception self.recipe = recipe - Exception.__init__(self, "Failure when parsing %s" % recipe) - self.args = (realexception, recipe) + Exception.__init__(self, realexception, recipe) def parse_file(task): filename, appends, caches_array = task @@ -1216,6 +1215,10 @@ class CookerParser(object): except KeyboardInterrupt: self.shutdown(clean=False) raise + except ParsingFailure as exc: + self.shutdown(clean=False) + bb.fatal('Error parsing %s: %s' % + (exc.recipe, bb.exceptions.to_string(exc.realexception))) except Exception as exc: self.shutdown(clean=False) bb.fatal('Error parsing %s: %s' % (exc.recipe, exc)) -- cgit v1.2.3-54-g00ecf