cooker: handle ExpansionError the same way we do ParseError

(Bitbake rev: 12aef37618bc77fb5ef085d24ad85471fb85c111)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 641a839810c5cd017523fd48f2b09179dcbbcf9c..ece88fce93154d062c8155ed59b088684aeda843 100644 (file)
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1227,7 +1227,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)