From 12aef37618bc77fb5ef085d24ad85471fb85c111 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 2 Jun 2011 14:45:13 -0700 Subject: [PATCH] cooker: handle ExpansionError the same way we do ParseError Signed-off-by: Chris Larson --- lib/bb/cooker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index db600956897..548d0a7b1d0 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1032,7 +1032,7 @@ def catch_parse_error(func): def wrapped(fn, *args): try: return func(fn, *args) - except (IOError, bb.parse.ParseError) as exc: + except (IOError, bb.parse.ParseError, bb.data_smart.ExpansionError) as exc: parselog.critical("Unable to parse %s: %s" % (fn, exc)) sys.exit(1) return wrapped @@ -1151,7 +1151,7 @@ class CookerParser(object): self.shutdown(clean=False) bb.fatal('Unable to parse %s: %s' % (exc.recipe, bb.exceptions.to_string(exc.realexception))) - except bb.parse.ParseError as exc: + except (bb.parse.ParseError, bb.data_smart.ExpansionError) as exc: bb.fatal(str(exc)) except SyntaxError as exc: logger.error('Unable to parse %s', exc.recipe) -- 2.47.3