aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-09-24 09:24:38 -0400
committerNirbheek Chauhan <nirbheek@centricular.com>2018-10-12 20:03:03 +0530
commit47877bfced023240a9488c4c17ae98b5995df73a (patch)
treefc10898400a6a12de237e1a73eae6e3a4a4ac0d4
parentdb5187ca402bed09dde31c5cc342df1a18bed918 (diff)
downloadmeson-47877bfced023240a9488c4c17ae98b5995df73a.zip
meson-47877bfced023240a9488c4c17ae98b5995df73a.tar.gz
meson-47877bfced023240a9488c4c17ae98b5995df73a.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.py2
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))