diff options
| author | Chris Larson <chris_larson@mentor.com> | 2011-06-02 14:45:13 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-08 20:38:25 +0100 |
| commit | 3fd34462ed6249cbcd52ae1556a3fac06d88f999 (patch) | |
| tree | aa024243f42cf4437370c26b1038d0a81e6fc780 /bitbake | |
| parent | 96e2ee1d730fa19665cca34c2cc3deb3fa5dfd2d (diff) | |
| download | poky-3fd34462ed6249cbcd52ae1556a3fac06d88f999.tar.gz | |
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>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 641a839810..ece88fce93 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -1227,7 +1227,7 @@ class CookerParser(object): | |||
| 1227 | self.shutdown(clean=False) | 1227 | self.shutdown(clean=False) |
| 1228 | bb.fatal('Unable to parse %s: %s' % | 1228 | bb.fatal('Unable to parse %s: %s' % |
| 1229 | (exc.recipe, bb.exceptions.to_string(exc.realexception))) | 1229 | (exc.recipe, bb.exceptions.to_string(exc.realexception))) |
| 1230 | except bb.parse.ParseError as exc: | 1230 | except (bb.parse.ParseError, bb.data_smart.ExpansionError) as exc: |
| 1231 | bb.fatal(str(exc)) | 1231 | bb.fatal(str(exc)) |
| 1232 | except SyntaxError as exc: | 1232 | except SyntaxError as exc: |
| 1233 | logger.error('Unable to parse %s', exc.recipe) | 1233 | logger.error('Unable to parse %s', exc.recipe) |