diff options
| author | Chet Gurevitch <chetgurevitch@protonmail.com> | 2017-08-08 16:41:31 -0700 |
|---|---|---|
| committer | Chet Gurevitch <chetgurevitch@protonmail.com> | 2017-08-18 01:22:39 -0700 |
| commit | 0ec2e530e10e38d29a56e1bd5d719f789cb2829f (patch) | |
| tree | adeb1693614f962575377367710b72569c4e79cf /mesonbuild/mesonmain.py | |
| parent | 62aabb5a8be90467603b1348d8ae4c0847bc5d1e (diff) | |
| download | meson-0ec2e530e10e38d29a56e1bd5d719f789cb2829f.zip meson-0ec2e530e10e38d29a56e1bd5d719f789cb2829f.tar.gz meson-0ec2e530e10e38d29a56e1bd5d719f789cb2829f.tar.bz2 | |
Don't error if build directory is already configured
Diffstat (limited to 'mesonbuild/mesonmain.py')
| -rw-r--r-- | mesonbuild/mesonmain.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index ed23f52..d4a45c1 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -113,13 +113,13 @@ class MesonApp: priv_dir = os.path.join(build_dir, 'meson-private/coredata.dat') if os.path.exists(priv_dir): if not handshake: - msg = '''Trying to run Meson on a build directory that has already been configured. + print('''Trying to run Meson on a build directory that has already been configured. If you want to build it, just run your build command (e.g. ninja) inside the build directory. Meson will autodetect any changes in your setup and regenerate itself as required. -If you want to change option values, use the mesonconf tool instead.''' - raise RuntimeError(msg) +If you want to change option values, use the mesonconf tool instead.''') + sys.exit(0) else: if handshake: raise RuntimeError('Something went terribly wrong. Please file a bug.') |