aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2019-11-28 16:38:19 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2019-11-28 17:01:10 +0530
commit20745a7c568e831441b925e8fb3d206113c49877 (patch)
tree09d3d4fb27dde042ac8a362c72c4ca14a84e6876
parentf1c20ff49a07f3df092a4773b70e0f79947d5fc1 (diff)
downloadmeson-20745a7c568e831441b925e8fb3d206113c49877.zip
meson-20745a7c568e831441b925e8fb3d206113c49877.tar.gz
meson-20745a7c568e831441b925e8fb3d206113c49877.tar.bz2
wrap: Redirect stdin to DEVNULL (again)
Same fix as e7b25018c4715e538234d4ba51e32194b4757388, was accidentally missed when this code was rewritten.
-rwxr-xr-xmesonbuild/msubprojects.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py
index bc6a6ce..eeeb9c6 100755
--- a/mesonbuild/msubprojects.py
+++ b/mesonbuild/msubprojects.py
@@ -41,6 +41,10 @@ def update_file(wrap, repo_dir, options):
def git(cmd, workingdir):
return subprocess.check_output(['git', '-C', workingdir] + cmd,
+ # Redirect stdin to DEVNULL otherwise git
+ # messes up the console and ANSI colors stop
+ # working on Windows.
+ stdin=subprocess.DEVNULL,
stderr=subprocess.STDOUT).decode()
def git_show(repo_dir):