diff options
| author | Alexandre Foley <Alexandre.foley@usherbrooke.ca> | 2016-12-05 17:25:36 -0500 |
|---|---|---|
| committer | Alexandre Foley <Alexandre.foley@usherbrooke.ca> | 2016-12-05 17:25:36 -0500 |
| commit | 228adaa287517015a5ec86d36fbd60b4bb031a31 (patch) | |
| tree | 3f2c84eb774d95e516bce3ffb555959a1c3cea37 /mesonbuild/interpreter.py | |
| parent | f3bd0d149174b2bbb4983b48e603e060a3e18c22 (diff) | |
| download | meson-228adaa287517015a5ec86d36fbd60b4bb031a31.zip meson-228adaa287517015a5ec86d36fbd60b4bb031a31.tar.gz meson-228adaa287517015a5ec86d36fbd60b4bb031a31.tar.bz2 | |
Wrap.py: Made it so using an already downloaded subproject is only for the wrap-file case. Git and Mercurial can update the repository if it the wrap is one.
Also did a bit of cleanup.
interpreter.py: There’s a catch all except clause at the line 1928, it didn’t give the user any information whatsoever about the exception it caught. Now it at least print it to the log as a warning.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index e9273e4..9ab68be 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1925,8 +1925,9 @@ requirements use the version keyword argument instead.''') raise # If the subproject execution failed in a non-fatal way, don't raise an # exception; let the caller handle things. - except: - mlog.log('Also couldn\'t find a fallback subproject in', + except Exception as e: + mlog.warning(e) + mlog.log('Couldn\'t find a fallback subproject in', mlog.bold(os.path.join(self.subproject_dir, dirname)), 'for the dependency', mlog.bold(name)) return None |