aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-10-05 09:20:32 -0700
committerXavier Claessens <xclaesse@gmail.com>2021-10-08 08:44:30 -0400
commitcfa6ff52e910e8cea88e3c7b74342add2efea900 (patch)
treefd06ba9ad08e50a8e6e20ceb654cf07f4ceb55da
parentbd00ea6b136ad97bf1c40bb4b55fe1057c474b6e (diff)
downloadmeson-cfa6ff52e910e8cea88e3c7b74342add2efea900.zip
meson-cfa6ff52e910e8cea88e3c7b74342add2efea900.tar.gz
meson-cfa6ff52e910e8cea88e3c7b74342add2efea900.tar.bz2
modules/gnome: Fix case that could never be hit due to bad types
It's impossible to get a Holder here, we'd get the unholdered build types. Mypy points this out for us.
-rw-r--r--mesonbuild/modules/gnome.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 5921475..5d8b7b4 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -222,9 +222,9 @@ class GnomeModule(ExtensionModule):
ifile = os.path.join(ifile.subdir, ifile.fname)
elif isinstance(ifile, str):
ifile = os.path.join(state.subdir, ifile)
- elif isinstance(ifile, (interpreter.CustomTargetHolder,
- interpreter.CustomTargetIndexHolder,
- interpreter.GeneratedObjectsHolder)):
+ elif isinstance(ifile, (build.CustomTarget,
+ build.CustomTargetIndex,
+ build.GeneratedList)):
m = 'Resource xml files generated at build-time cannot be used ' \
'with gnome.compile_resources() because we need to scan ' \
'the xml for dependencies. Use configure_file() instead ' \