diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-06-06 14:23:17 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-07 12:56:27 +0000 |
| commit | 2d3bfa0778d3f7068585c82e991a25c0ce79fbac (patch) | |
| tree | 8e3979d5c1cb7893a90f3bd929d4d1a58d9506cb /mesonbuild/interpreter.py | |
| parent | e581a8937f290fada2eaecc95c978aa6db8e3a2f (diff) | |
| download | meson-2d3bfa0778d3f7068585c82e991a25c0ce79fbac.zip meson-2d3bfa0778d3f7068585c82e991a25c0ce79fbac.tar.gz meson-2d3bfa0778d3f7068585c82e991a25c0ce79fbac.tar.bz2 | |
Interpreter: Fix subdir_done() to exit from inside if/foreach blocks
Closes: #3700.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 86c55e4..a58e57d 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3128,7 +3128,10 @@ root and issuing %s. except mesonlib.MesonException as me: me.file = buildfilename raise me - self.evaluate_codeblock(codeblock) + try: + self.evaluate_codeblock(codeblock) + except SubdirDoneRequest: + pass self.subdir = prev_subdir def _get_kwarg_install_mode(self, kwargs): |