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

[Xisco Fauli]

 esc-reporting/qa-tools.py |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 6439e1187183696077adee99c654655f1c30f88b
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Dec 11 11:41:06 2017 +0100

    QA tools: Fix incorrect statement

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index 9900029..01e0068 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -631,7 +631,7 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
                         newSystem = change['added']
                         util_increase_user_actions(statList, rowId, actionMail, bugTargets, 'system_changed', actionDate)
 
-                        if actionDate >= cfg['reportPeriod'] and newSystem not in row['op_sys']:
+                        if actionDate >= cfg['reportPeriod'] and newSystem in row['op_sys']:
                             statList['weeklyReport']['system_changed'][newSystem]['id'].append(rowId)
                             statList['weeklyReport']['system_changed'][newSystem]['author'].append(actionMail)
 
commit 27213efcd379ac2dcb28d68e93544ff80f8ed2e6
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Dec 11 11:35:41 2017 +0100

    QA tools: Sort metabug lists by aliases
    
    Requested by Thomas Lendo

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index 9d49f22..9900029 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -872,7 +872,15 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 
 def util_print_QA_line_weekly(fp, statList, dValue, action, isMetabug=False):
 
-    for key, value in dValue.items():
+    #Replace metabugs keys by aliases
+    if isMetabug:
+        dValueAux = {}
+        for key, value in dValue.items():
+            if int(key) in statList['bugs']['metabugAlias']:
+                dValueAux[statList['bugs']['metabugAlias'][int(key)][0]] = dValue[key]
+        dValue = dValueAux
+
+    for key, value in sorted(dValue.items()):
         if value['id']:
             nBugs = len(value['id'])
             if nBugs == 1:
@@ -883,8 +891,6 @@ def util_print_QA_line_weekly(fp, statList, dValue, action, isMetabug=False):
                 aux2 = 'bugs'
 
             if action == 'added' or action == 'removed':
-                if isMetabug and int(key) in statList['bugs']['metabugAlias']:
-                    key = statList['bugs']['metabugAlias'][int(key)][0]
                 aux3 = 'to'
                 if action == 'removed':
                     aux3 = 'from'