diff options
| author | Dima Krasner <dima@dimakrasner.com> | 2017-02-07 09:41:57 +0200 |
|---|---|---|
| committer | Dima Krasner <dima@dimakrasner.com> | 2017-02-07 09:42:55 +0200 |
| commit | 65029f4114b37423b673c292386a9c5be7896f64 (patch) | |
| tree | dd4aa4443eb8a5337c190eafb18885e2527a009e | |
| parent | 4dae59dfeac2af2f48e54d504293757a10834619 (diff) | |
| download | meson-65029f4114b37423b673c292386a9c5be7896f64.zip meson-65029f4114b37423b673c292386a9c5be7896f64.tar.gz meson-65029f4114b37423b673c292386a9c5be7896f64.tar.bz2 | |
Bug fix - KeyError on subproject without default options
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index cb5b617..8582740 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1576,9 +1576,10 @@ class Interpreter(InterpreterBase): @stringArgs def func_project(self, node, args, kwargs): - if self.environment.first_invocation and ('default_options' in kwargs or + default_options = kwargs.get('default_options', []) + if self.environment.first_invocation and (len(default_options) > 0 or len(self.default_project_options) > 0): - self.parse_default_options(kwargs['default_options']) + self.parse_default_options(default_options) if not self.is_subproject(): self.build.project_name = args[0] if os.path.exists(self.option_file): |