aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-09-20 13:26:38 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-09-20 16:42:11 -0400
commit30f24bfa3207087b2d12144348ed2fe4f821894c (patch)
tree2d567b6b81a76cefeb6509b2ecedf7dcebcf2a44
parent945f1851461a9db91ee0d2a4d623d15020650c2b (diff)
downloadmeson-30f24bfa3207087b2d12144348ed2fe4f821894c.zip
meson-30f24bfa3207087b2d12144348ed2fe4f821894c.tar.gz
meson-30f24bfa3207087b2d12144348ed2fe4f821894c.tar.bz2
dependency: If cached version is outdated, look on system again
Fixes: #9271
-rw-r--r--mesonbuild/interpreter/dependencyfallbacks.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py
index 64b3f47..7d3a7d8 100644
--- a/mesonbuild/interpreter/dependencyfallbacks.py
+++ b/mesonbuild/interpreter/dependencyfallbacks.py
@@ -219,6 +219,10 @@ class DependencyFallbacksHolder(MesonInterpreterObject):
if cached_dep:
found_vers = cached_dep.get_version()
if not self._check_version(wanted_vers, found_vers):
+ if not override:
+ # We cached this dependency on disk from a previous run,
+ # but it could got updated on the system in the meantime.
+ return None
mlog.log('Dependency', mlog.bold(name),
'found:', mlog.red('NO'),
'found', mlog.normal_cyan(found_vers), 'but need:',