diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-08 01:02:09 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-15 22:33:25 +0200 |
| commit | b389f430609a4956d23beddcdaa26b3fea06bc23 (patch) | |
| tree | d183c2526d19176c8bfc33185f9c90e9173be51e /mesonbuild/interpreter.py | |
| parent | 21e475b64b2eaadfc9f5209562d008999417ee7d (diff) | |
| download | meson-b389f430609a4956d23beddcdaa26b3fea06bc23.zip meson-b389f430609a4956d23beddcdaa26b3fea06bc23.tar.gz meson-b389f430609a4956d23beddcdaa26b3fea06bc23.tar.bz2 | |
Revert "Merge pull request #1145 from AlexandreFoley/wrap-fix"
This reverts commit 541dd92ef7a10b0f657f3c8532ffb71a8d921f54, reversing
changes made to 155617e539a9aeccda6bd186398123b9d5521ed4.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 68be677..b586997 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1757,9 +1757,8 @@ 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 Exception as e: - mlog.warning(e) - mlog.log('Couldn\'t find a fallback subproject in', + except: + mlog.log('Also couldn\'t find a fallback subproject in', mlog.bold(os.path.join(self.subproject_dir, dirname)), 'for the dependency', mlog.bold(name)) return None |