From 2984877989ec181409871dfde6723f7f9de466e1 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 15 Dec 2010 22:07:38 -0700 Subject: cooker: don't swallow recipe parse errors (Bitbake rev: 1f5d49ce64e5e1c7705edbfa3c8e19649c21edd2) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 8ac88b99a..7a9b1d58d 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -965,7 +965,11 @@ class CookerExit(bb.event.Event): def parse_file(task): filename, appends = task - return True, bb.cache.Cache.parse(filename, appends, parse_file.cfg) + try: + return True, bb.cache.Cache.parse(filename, appends, parse_file.cfg) + except Exception, exc: + exc.recipe = filename + raise exc class CookerParser(object): def __init__(self, cooker, filelist, masked): @@ -1049,7 +1053,7 @@ class CookerParser(object): raise except Exception as exc: self.shutdown(clean=False) - sys.exit(1) + bb.fatal('Error parsing %s: %s' % (exc.recipe, exc)) self.current += 1 self.virtuals += len(result) -- cgit v1.2.3