diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2024-02-15 09:27:07 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-02-22 09:05:07 -0800 |
| commit | 477783a65b6592b857d12b23abba6b1fb5dff01f (patch) | |
| tree | ac322a0f4ac38372175ca6c60ec8973e75007a6a | |
| parent | a35d4d368a21f4b70afa3195da4d6292a649cb4c (diff) | |
| download | meson-477783a65b6592b857d12b23abba6b1fb5dff01f.zip meson-477783a65b6592b857d12b23abba6b1fb5dff01f.tar.gz meson-477783a65b6592b857d12b23abba6b1fb5dff01f.tar.bz2 | |
build: fix some type annotations for get_install_dir
| -rw-r--r-- | mesonbuild/build.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 7aea229..e97cc42 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -570,10 +570,11 @@ class Target(HoldableObject, metaclass=abc.ABCMeta): def get_custom_install_dir(self) -> T.List[T.Union[str, Literal[False]]]: raise NotImplementedError - def get_install_dir(self) -> T.Tuple[T.List[T.Union[str, Literal[False]]], str, Literal[False]]: + def get_install_dir(self) -> T.Tuple[T.List[T.Union[str, Literal[False]]], T.List[T.Optional[str]], bool]: # Find the installation directory. default_install_dir, default_install_dir_name = self.get_default_install_dir() - outdirs = self.get_custom_install_dir() + outdirs: T.List[T.Union[str, Literal[False]]] = self.get_custom_install_dir() + install_dir_names: T.List[T.Optional[str]] if outdirs and outdirs[0] != default_install_dir and outdirs[0] is not True: # Either the value is set to a non-default value, or is set to # False (which means we want this specific output out of many |