diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-08-06 15:16:49 -0400 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-08-07 11:20:57 +0200 |
| commit | 943596abbb1cba5b6b00051505df4ddd2480aee0 (patch) | |
| tree | b42028ceb9fdc204f83d1a534ad4236caf6fb4bc /mesonbuild | |
| parent | 1dcde9da61205f762ee4f1880732b18ee7360389 (diff) | |
| download | meson-943596abbb1cba5b6b00051505df4ddd2480aee0.zip meson-943596abbb1cba5b6b00051505df4ddd2480aee0.tar.gz meson-943596abbb1cba5b6b00051505df4ddd2480aee0.tar.bz2 | |
Fix --force-fallack-for with --wrap-mode=nofallback
Fixes: #9065
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/interpreter/dependencyfallbacks.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py index 2639e42..5934cbd 100644 --- a/mesonbuild/interpreter/dependencyfallbacks.py +++ b/mesonbuild/interpreter/dependencyfallbacks.py @@ -105,13 +105,13 @@ class DependencyFallbacksHolder(MesonInterpreterObject): return None def _do_subproject(self, kwargs: TYPE_nkwargs, func_args: TYPE_nvar, func_kwargs: TYPE_nkwargs) -> T.Optional[Dependency]: - if self.nofallback: - mlog.log('Not looking for a fallback subproject for the dependency', - mlog.bold(self.display_name), 'because:\nUse of fallback dependencies is disabled.') - return None if self.forcefallback: mlog.log('Looking for a fallback subproject for the dependency', mlog.bold(self.display_name), 'because:\nUse of fallback dependencies is forced.') + elif self.nofallback: + mlog.log('Not looking for a fallback subproject for the dependency', + mlog.bold(self.display_name), 'because:\nUse of fallback dependencies is disabled.') + return None else: mlog.log('Looking for a fallback subproject for the dependency', mlog.bold(self.display_name)) |