diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-08 01:08:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 01:08:51 +0300 |
| commit | d6e71d0c566416c0ba940323c6f2734695c999d0 (patch) | |
| tree | f87bf2eddd51f69213419b117162274725c480a9 /mesonbuild/interpreter.py | |
| parent | 09dd9e20df33c2ce91ec3304df6ad3909147987b (diff) | |
| parent | 1105ba3afdf2f533782c5cc5ee984745989a1914 (diff) | |
| download | meson-d6e71d0c566416c0ba940323c6f2734695c999d0.zip meson-d6e71d0c566416c0ba940323c6f2734695c999d0.tar.gz meson-d6e71d0c566416c0ba940323c6f2734695c999d0.tar.bz2 | |
Merge pull request #3312 from MathieuDuponchelle/alwaysfallback
new wrap-mode: forcefallback
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index e973c1e..b04d586 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2404,10 +2404,13 @@ to directly access options of other subprojects.''') dep = None # Search for it outside the project - try: - dep = dependencies.find_external_dependency(name, self.environment, kwargs) - except DependencyException as e: - exception = e + if self.coredata.wrap_mode != WrapMode.forcefallback or 'fallback' not in kwargs: + try: + dep = dependencies.find_external_dependency(name, self.environment, kwargs) + except DependencyException as e: + exception = e + else: + exception = DependencyException("fallback for %s not found" % name) # Search inside the projects list if not dep or not dep.found(): |