diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-16 12:00:04 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-16 12:00:04 +0300 |
commit | 76d6fab8aefaf486f7c8ca84d0686521931f261a (patch) | |
tree | 7ff9ef20a7cbb4b53c9fa1e6c2413a34bc291b3d | |
parent | b52955ff3d3a73891c9250b0c6e3839593cd456b (diff) | |
download | meson-76d6fab8aefaf486f7c8ca84d0686521931f261a.zip meson-76d6fab8aefaf486f7c8ca84d0686521931f261a.tar.gz meson-76d6fab8aefaf486f7c8ca84d0686521931f261a.tar.bz2 |
Simplified control flow.
-rw-r--r-- | mesonbuild/interpreter.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 8885e2b..8d35055 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2007,9 +2007,6 @@ class Interpreter(InterpreterBase): raise DependencyException(m.format(name)) dep = cached_dep else: - # We need to actually search for this dep - exception = None - dep = None # If the dependency has already been configured, possibly by # a higher level project, try to use it first. if 'fallback' in kwargs: @@ -2022,13 +2019,16 @@ class Interpreter(InterpreterBase): except KeyError: pass + # We need to actually search for this dep + exception = None + dep = None + # Search for it outside the project - if not dep: - try: - dep = dependencies.find_external_dependency(name, self.environment, kwargs) - except DependencyException as e: - exception = e - pass + try: + dep = dependencies.find_external_dependency(name, self.environment, kwargs) + except DependencyException as e: + exception = e + pass # Search inside the projects list if not dep or not dep.found(): |