Fix --force-fallack-for with --wrap-mode=nofallback

Fixes: #9065
mesonbuild · Aug 7, 2021 · 943596a · 943596a
1 parent 1dcde9d
commit 943596a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py
@@ -105,13 +105,13 @@ def _do_existing_subproject(self, kwargs: TYPE_nkwargs, func_args: TYPE_nvar, fu
         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))

diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
@@ -556,6 +556,12 @@ def test_force_fallback_for(self):
         self.build()
         self.run_tests()
 
+    def test_force_fallback_for_nofallback(self):
+        testdir = os.path.join(self.unit_test_dir, '31 forcefallback')
+        self.init(testdir, extra_args=['--force-fallback-for=zlib,foo', '--wrap-mode=nofallback'])
+        self.build()
+        self.run_tests()
+
     def test_testrepeat(self):
         testdir = os.path.join(self.common_test_dir, '206 tap tests')
         self.init(testdir)