diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-09-20 09:01:07 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-09-20 13:42:07 -0400 |
| commit | e9386e80ae413e04e4fe36d46820c8346ef835e0 (patch) | |
| tree | f0e5f99e47346242cb03e8ceaa1c400c56d296c7 /mesonbuild/interpreter/interpreter.py | |
| parent | 4e41a6203fe2d5bc37d44216bcfd865d9575a819 (diff) | |
| download | meson-e9386e80ae413e04e4fe36d46820c8346ef835e0.zip meson-e9386e80ae413e04e4fe36d46820c8346ef835e0.tar.gz meson-e9386e80ae413e04e4fe36d46820c8346ef835e0.tar.bz2 | |
dependencyfallbacks: Use default_options for implicit fallbacks
This removes the warning when using default_options without fallback
kwarg completely because a subproject does not know if the main project
has an implicit fallback or not, so it could set default_options even if
not fallback is available at all.
Fixes: #9278
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 891c606..1268e3e 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1472,8 +1472,8 @@ external dependencies (including libraries) must go to "dependencies".''') raise InvalidArguments('"allow_fallback" argument must be boolean') fallback = kwargs.get('fallback') default_options = kwargs.get('default_options') - df = DependencyFallbacksHolder(self, names, allow_fallback) - df.set_fallback(fallback, default_options) + df = DependencyFallbacksHolder(self, names, allow_fallback, default_options) + df.set_fallback(fallback) not_found_message = kwargs.get('not_found_message', '') if not isinstance(not_found_message, str): raise InvalidArguments('The not_found_message must be a string.') |