aboutsummaryrefslogtreecommitdiff
path: root/meson.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-04-01 14:08:54 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-04-01 14:08:54 +0300
commitb77ac5ec9f8efa2ba589ba65def1ba2d219a8ff3 (patch)
tree95f24daea25ca7a69653e736c79b0fccf2a03449 /meson.py
parente12100b7264c12a619ffa940a3e5022d5e992252 (diff)
downloadmeson-b77ac5ec9f8efa2ba589ba65def1ba2d219a8ff3.zip
meson-b77ac5ec9f8efa2ba589ba65def1ba2d219a8ff3.tar.gz
meson-b77ac5ec9f8efa2ba589ba65def1ba2d219a8ff3.tar.bz2
Extracted dependencies to their own file.
Diffstat (limited to 'meson.py')
-rwxr-xr-xmeson.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/meson.py b/meson.py
index 9aebc1f..a1b7858 100755
--- a/meson.py
+++ b/meson.py
@@ -15,12 +15,12 @@
# limitations under the License.
from optparse import OptionParser
-import sys, stat
+import sys, stat, traceback
import os.path
import environment, interpreter
import backends, build
-from coredata import version
+from coredata import version, MesonException
usage_info = '%prog [options] source_dir build_dir'
@@ -128,7 +128,10 @@ if __name__ == '__main__':
try:
app.generate()
except Exception as e:
- print('\nMeson encountered an error:')
- print(e)
- sys.exit(1)
+ if isinstance(e, MesonException):
+ print('\nMeson encountered an error:')
+ print(e)
+ sys.exit(1)
+ else:
+ traceback.print_exc()