aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/wrap
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2024-02-16 10:03:56 -0800
committerDylan Baker <dylan@pnwbakers.com>2024-02-22 09:05:33 -0800
commit9a493f541f2f7c63e0ce1ab5ac1e6cc29be5fff5 (patch)
treef71ea513dc35a477367097893ef7e3e342732408 /mesonbuild/wrap
parent413c288d0dbee0c3ac96624084acec15c25de017 (diff)
downloadmeson-9a493f541f2f7c63e0ce1ab5ac1e6cc29be5fff5.zip
meson-9a493f541f2f7c63e0ce1ab5ac1e6cc29be5fff5.tar.gz
meson-9a493f541f2f7c63e0ce1ab5ac1e6cc29be5fff5.tar.bz2
wrap: correct return annotation of `Resolver.get_from_wrapdb()`
It returns `None | PackageDefinition`, not `PackageDefinition`
Diffstat (limited to 'mesonbuild/wrap')
-rw-r--r--mesonbuild/wrap/wrap.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py
index 6032967..ba4c5e3 100644
--- a/mesonbuild/wrap/wrap.py
+++ b/mesonbuild/wrap/wrap.py
@@ -351,7 +351,7 @@ class Resolver:
self.wrapdb_provided_deps.update({i: name for i in info.get('dependency_names', [])})
self.wrapdb_provided_programs.update({i: name for i in info.get('program_names', [])})
- def get_from_wrapdb(self, subp_name: str) -> PackageDefinition:
+ def get_from_wrapdb(self, subp_name: str) -> T.Optional[PackageDefinition]:
info = self.wrapdb.get(subp_name)
if not info:
return None
@@ -405,11 +405,10 @@ class Resolver:
self.packagename = packagename
self.directory = packagename
wrap = self.wraps.get(packagename)
- if not wrap:
+ if wrap is None:
wrap = self.get_from_wrapdb(packagename)
- if not wrap:
- m = f'Neither a subproject directory nor a {self.packagename}.wrap file was found.'
- raise WrapNotFoundException(m)
+ if wrap is None:
+ raise WrapNotFoundException(f'Neither a subproject directory nor a {self.packagename}.wrap file was found.')
self.wrap = wrap
self.directory = self.wrap.directory