From 65029f4114b37423b673c292386a9c5be7896f64 Mon Sep 17 00:00:00 2001 From: Dima Krasner Date: Tue, 7 Feb 2017 09:41:57 +0200 Subject: [PATCH 1/3] Bug fix - KeyError on subproject without default options --- mesonbuild/interpreter.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index cb5b6175d..8582740b2 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): From 795fc62b62f023717eba868790aa6dfd22ebcf99 Mon Sep 17 00:00:00 2001 From: Dima Krasner Date: Wed, 8 Feb 2017 20:22:09 +0200 Subject: [PATCH 2/3] Added myself to authors.txt --- authors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/authors.txt b/authors.txt index 72606e901..2f36256cc 100644 --- a/authors.txt +++ b/authors.txt @@ -62,3 +62,4 @@ Matthieu Gautier Kseniia Vasilchuk Philipp Geier Mike Sinkovsky +Dima Krasner From a306a1f676936c6e7270e310e00472757492b9e3 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 8 Feb 2017 00:44:44 +0530 Subject: [PATCH 3/3] tests/common/95: Add a test for #1368 --- test cases/common/95 dep fallback/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test cases/common/95 dep fallback/meson.build b/test cases/common/95 dep fallback/meson.build index 212c64f69..9358d296e 100644 --- a/test cases/common/95 dep fallback/meson.build +++ b/test cases/common/95 dep fallback/meson.build @@ -1,6 +1,7 @@ project('dep fallback', 'c') -bob = dependency('boblib', fallback : ['boblib', 'bob_dep'], required: false) +bob = dependency('boblib', fallback : ['boblib', 'bob_dep'], required: false, + default_options : 'warning_level=1') if not bob.found() error('Bob is actually needed') endif