diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-10 15:01:05 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-23 22:09:55 +0300 |
| commit | 61348da069bd3afe28a9de03e7792e20a9cb2eac (patch) | |
| tree | 1db7fc90efbda6f95d7c5332788ca7b3da88e95f /mesonbuild/modules/python.py | |
| parent | 87355c81326edd253f433f08e8d58f9df059951f (diff) | |
| download | meson-61348da069bd3afe28a9de03e7792e20a9cb2eac.zip meson-61348da069bd3afe28a9de03e7792e20a9cb2eac.tar.gz meson-61348da069bd3afe28a9de03e7792e20a9cb2eac.tar.bz2 | |
Add 'disabler' argument to functions returning not-found objects
When dependency(), find_library(), find_program(), or
python.find_installation() return a not-found object and disabler is
true, they return a Disabler object instead.
Diffstat (limited to 'mesonbuild/modules/python.py')
| -rw-r--r-- | mesonbuild/modules/python.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 2229949..954220b 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -23,7 +23,7 @@ from mesonbuild.modules import ModuleReturnValue from ..interpreterbase import ( noPosargs, noKwargs, permittedKwargs, InterpreterObject, InvalidArguments, - FeatureNew + FeatureNew, FeatureNewKwargs, disablerIfNotFound ) from ..interpreter import ExternalProgramHolder, extract_required_kwarg from ..interpreterbase import flatten @@ -467,6 +467,8 @@ class PythonModule(ExtensionModule): return mesonlib.version_compare(version, '>= 3.0') return True + @FeatureNewKwargs('python.find_installation', '0.49.0', ['disabler']) + @disablerIfNotFound @permittedKwargs(['required']) def find_installation(self, interpreter, state, args, kwargs): feature_check = FeatureNew('Passing "feature" option to find_installation', '0.48.0') |