esc-reporting/esc-collect.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 2220535e1afa60430d007feaf124c130d1375fee Author: Guilhem Moulin <guil...@libreoffice.org> AuthorDate: Wed Feb 19 19:17:59 2020 +0100 Commit: Guilhem Moulin <guil...@libreoffice.org> CommitDate: Wed Feb 19 19:40:01 2020 +0100 esc-collect: set --recursive flag in `gerrit ls-members` We want to list all members here. It doesn't make any difference right now as the “Committers” group isn't nested. diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py index 3adedf5..26a8481 100755 --- a/esc-reporting/esc-collect.py +++ b/esc-reporting/esc-collect.py @@ -592,7 +592,8 @@ def get_gerrit(cfg): rawList['committers'] = [] # Could use the REST API instead and receive pre-formatted JSON, but that requires HTTP auth - cmd = ["ssh", "-p", "29418", "gerrit.libreoffice.org", "gerrit", "ls-members", "Committers"] + cmd = ["ssh", "-p", "29418", "gerrit.libreoffice.org", "gerrit", + "ls-members", "--recursive", "Committers"] p = Popen(cmd, stdout=PIPE) p.stdout.readline() # strip header for line in io.TextIOWrapper(p.stdout, encoding="utf-8"): commit d9d970d9f4f43f898865ae06ba4161b5015a5b35 Author: Guilhem Moulin <guil...@libreoffice.org> AuthorDate: Wed Feb 19 19:12:43 2020 +0100 Commit: Guilhem Moulin <guil...@libreoffice.org> CommitDate: Wed Feb 19 19:39:52 2020 +0100 esc-colllect: strip header in `gerrit ls-members` This is a regression from 49b88333c8b541a391d11c1b0341e25445e2ef71. diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py index 034e0ca..3adedf5 100755 --- a/esc-reporting/esc-collect.py +++ b/esc-reporting/esc-collect.py @@ -594,6 +594,7 @@ def get_gerrit(cfg): # Could use the REST API instead and receive pre-formatted JSON, but that requires HTTP auth cmd = ["ssh", "-p", "29418", "gerrit.libreoffice.org", "gerrit", "ls-members", "Committers"] p = Popen(cmd, stdout=PIPE) + p.stdout.readline() # strip header for line in io.TextIOWrapper(p.stdout, encoding="utf-8"): row = line.rstrip().split('\t') rawList['committers'].append({"_account_id": int(row[0]), _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits