diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-09-24 09:24:38 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2018-09-24 10:58:53 -0400 |
commit | 2f0285c7ef3a3dab71e8d6f4df92ef978470c553 (patch) | |
tree | 0316c8bbe7b8668cea0ef77b124bc5edf5e3fe98 | |
parent | 1190ec096e68a35a8964ea20654191bdc15f058b (diff) | |
download | meson-2f0285c7ef3a3dab71e8d6f4df92ef978470c553.zip meson-2f0285c7ef3a3dab71e8d6f4df92ef978470c553.tar.gz meson-2f0285c7ef3a3dab71e8d6f4df92ef978470c553.tar.bz2 |
Return code 0 when builddir is already configured
This is a regression in Meson 0.48.0, commit 674ae46, Meson used to
exit(0) when running setup command in a builddir already configured.
Changing to exit(1) breaks some build tools that does "meson builddir
&& ninja -C builddir".
Closes #4247.
-rw-r--r-- | mesonbuild/mesonmain.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index cd925e5..dfad2e7 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -113,7 +113,7 @@ class MesonApp: '\nIf build failures persist, manually wipe your build directory to clear any\n' 'stored system data.\n' '\nTo change option values, run "meson configure" instead.') - sys.exit(1) + sys.exit(0) else: if reconfigure: print('Directory does not contain a valid build tree:\n{}'.format(build_dir)) |