diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2022-05-01 00:01:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-01 00:01:03 +0300 |
| commit | bba588d8b03a9125bf5c4faaad31b70d39242b68 (patch) | |
| tree | 63afdf87d9a5bfbb0953170ac89a46bedb02710d /mesonbuild/interpreter/interpreterobjects.py | |
| parent | b30d04f52b5e13bf0c1047439465997184869c09 (diff) | |
| parent | c181f2c70bd606f0100f74844fcf9697be16c217 (diff) | |
| download | meson-bba588d8b03a9125bf5c4faaad31b70d39242b68.zip meson-bba588d8b03a9125bf5c4faaad31b70d39242b68.tar.gz meson-bba588d8b03a9125bf5c4faaad31b70d39242b68.tar.bz2 | |
Merge pull request #10039 from eli-schwartz/wayland-protocols-subproject-files
dependencies: allow get_variable to expose files from subprojects
Diffstat (limited to 'mesonbuild/interpreter/interpreterobjects.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index a07d548..e59ba6b 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -479,7 +479,7 @@ class DependencyHolder(ObjectHolder[Dependency]): KwargInfo('default_value', (str, NoneType)), KwargInfo('pkgconfig_define', ContainerTypeInfo(list, str, pairs=True), default=[], listify=True), ) - def variable_method(self, args: T.Tuple[T.Optional[str]], kwargs: 'kwargs.DependencyGetVariable') -> T.Union[str, T.List[str]]: + def variable_method(self, args: T.Tuple[T.Optional[str]], kwargs: 'kwargs.DependencyGetVariable') -> str: default_varname = args[0] if default_varname is not None: FeatureNew('Positional argument to dependency.get_variable()', '0.58.0').use(self.subproject, self.current_node) |