Print friendlier error messages rather than the Python stack trace.

2 files changed, 7 insertions, 2 deletions

diff --git a/interpreter.py b/interpreter.py
index e72a6b3..2c39344 100755
--- a/interpreter.py
+++ b/interpreter.py
@@ -729,7 +729,7 @@ class Interpreter():
         prev_subdir = self.subdir
         subdir = os.path.join(prev_subdir, args[0])
         if subdir in self.visited_subdirs:
-            raise InvalidArguments('Line %d: tried to enter subdir "%s", which has already been visited.'\
+            raise InvalidArguments('Line %d: tried to enter directory "%s", which has already been visited.'\
                                    % (node.lineno(), subdir))
         self.visited_subdirs[subdir] = True
         self.subdir = subdir
diff --git a/meson.py b/meson.py
index b313d45..f8e37ab 100755
--- a/meson.py
+++ b/meson.py
@@ -127,5 +127,10 @@ if __name__ == '__main__':
     app = MesonApp(dir1, dir2, this_file, options)
     print ('Source dir: ' + app.source_dir)
     print ('Build dir: ' + app.build_dir)
-    app.generate()
+    try:
+        app.generate()
+    except Exception as e:
+        print('\nMeson encountered an error:')
+        print(e)
+        sys.exit(1)