[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py

[jan Iversen]

 esc-reporting/esc-collect.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 0f509b76f5506ca51ca2a5170221aa72f62516a9
Author: jan Iversen <jani at libreoffice.org>
Date:   Tue May 16 19:41:16 2017 +0200

    esc-report, restrict gerrit auth to committer list

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index f003fcc..685e673 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -559,11 +559,11 @@ def get_gerrit(cfg):
     searchDate, rawList = util_load_data_file(cfg, fileName, 'gerrit', {'patch': {}, 'committers' : []})
     print("Updating gerrit dump from " + rawList['newest-entry'])
 
-    urlBase = 'https://gerrit.libreoffice.org/a/'
+    urlBase = 'https://gerrit.libreoffice.org/'
     uid = cfg['gerrit']['user']
     upw = cfg['gerrit']['password']
     rawList['committers'] = []
-    tmp = util_load_url(urlBase + 'groups/Committers/members', uUser=uid, uPass=upw)
+    tmp = util_load_url(urlBase + 'a/groups/Committers/members', uUser=uid, uPass=upw)
     for row in tmp:
       for i in 'username', 'email':
         if not i in row:
@@ -708,6 +708,11 @@ def runCfg(platform):
 
 def runBuild(cfg):
     try:
+      gerritData = get_gerrit(cfg)
+    except Exception as e:
+      print('ERROR: get_gerrit failed with ' + str(e))
+      pass
+    try:
       crashData = get_crash(cfg)
     except Exception as e:
       print('ERROR: get_crash failed with ' + str(e))
@@ -728,11 +733,6 @@ def runBuild(cfg):
       print('ERROR: get_esc_bugzilla failed with ' + str(e))
       pass
     try:
-      gerritData = get_gerrit(cfg)
-    except Exception as e:
-      print('ERROR: get_gerrit failed with ' + str(e))
-      pass
-    try:
       gitData = get_git(cfg)
     except Exception as e:
       print('ERROR: get_git failed with ' + str(e))