diff options
| author | Guilhem Moulin <guilhem@libreoffice.org> | 2020-02-22 00:13:24 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@libreoffice.org> | 2020-02-29 02:29:14 +0100 |
| commit | ad46e751df6c18f157cdbfadf506ad801abeee65 (patch) | |
| tree | 3982ffb0181aa5d81490ceb674f7f443552fc106 | |
| parent | 106130a15006126a2b8b8a05955600568131840c (diff) | |
esc-collect: Try harder to silence `git pull --all --rebase`
For some reason --quiet doesn't affect the checkout phase: progress info
“Checking out files: X% (N/M)” leaks to the error output, which is
treated like if it were a TTY.
This is a regression from 1520268a8c5511ad9c21980f1de5d3d8711fb1fe.
| -rwxr-xr-x | esc-reporting/esc-collect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py index d89f1f45..306d2a67 100755 --- a/esc-reporting/esc-collect.py +++ b/esc-reporting/esc-collect.py @@ -38,7 +38,7 @@ import datetime import json import xmltodict import requests -from subprocess import check_call, Popen, PIPE, CalledProcessError +from subprocess import check_call, Popen, DEVNULL, PIPE, CalledProcessError from requests.auth import HTTPDigestAuth @@ -668,7 +668,7 @@ def get_git(cfg): '"committer": "%cn", "committer-email": "%ce" }' basedir = cfg['homedir'] + '../libreoffice/' if repo['git'] and cfg['platform'] == 'linux': - check_call(["git", "-C", basedir + repo['dir'], "pull", "--quiet", "--rebase", "--all"]) + check_call(["git", "-C", basedir + repo['dir'], "pull", "--quiet", "--all", "--rebase"], stderr=DEVNULL) p = Popen([ "git", "-C", basedir + repo['dir'], "log", "--pretty=format:" + useFormat ], stdout=PIPE) for x in io.TextIOWrapper(p.stdout, encoding="utf-8"): # Json fails if there's a backslash somewhere in the git log |