Also for stats report which repo and which job number use our setup

[neurodebian.git] / tools / nd_popcon2stats

diff --git a/tools/nd_popcon2stats b/tools/nd_popcon2stats
index 35594018b98154f5040dfdbb96cdba6f1b88a6aa..8996076662e41321f1fec7d3b82fe0f87ee1836a 100755 (executable)
--- a/tools/nd_popcon2stats
+++ b/tools/nd_popcon2stats
@@ -7,7 +7,6 @@ import sys
 import time
 from datetime import datetime
 import re
-import sets
 import json
 import operator
 
@@ -16,7 +15,8 @@ releases = {
     'etch': 'Debian GNU/Linux 4.0 (etch)',
     'lenny': 'Debian GNU/Linux 5.0 (lenny)',
     'squeeze': 'Debian GNU/Linux 6.0 (squeeze)',
-    'wheezy': 'Debian testing (wheezy)',
+    'wheezy': 'Debian GNU/Linux 7.0 (wheezy)',
+    'jessie': 'Debian testing (jessie)',
     'sid': 'Debian unstable (sid)',
     'hardy': 'Ubuntu 08.04 LTS "Hardy Heron" (hardy)',
     'jaunty': 'Ubuntu 09.04 "Jaunty Jackalope" (jaunty)',
@@ -29,6 +29,7 @@ releases = {
     'quantal': 'Ubuntu 12.10 "Quantal Quetzal" (quantal)',
     'raring': 'Ubuntu 13.04 "Raring Ringtail" (raring)',
     'saucy': 'Ubuntu 13.10 "Saucy Salamander" (saucy)',
+    'trusty': 'Ubuntu 14.04 LTS "Trusty Tahr" (trusty)',
 }
 
 def error(msg):
@@ -46,7 +47,8 @@ def read_popcon_stats(filename, read_packages=True):
     entry = dict(submissions = None,
                  package = {},
                  release = {},
-                 architecture = {})
+                 architecture = {},
+                 vendor = {})
 
     for line in fileinput.FileInput(filename, openhook=fileinput.hook_compressed):
         key, values = [x.strip().lower() for x in line.split(':', 1)]
@@ -58,20 +60,20 @@ def read_popcon_stats(filename, read_packages=True):
             except ValueError:
                 raise ValueError("Failed to split %s" % values)
             entry[key][pkg] = tuple(int(x) for x in (vote, old, recent, nofiles))
-        elif key in ('release', 'architecture'):
+        elif key in ('release', 'architecture', 'vendor'):
             kvalue, value = values.split()
             entry[key][kvalue] = int(value)
         elif key == 'submissions':
             entry[key] = int(values)
         else:
-            raise ValueError("Do not know how to handle line" % line)
+            raise ValueError("Do not know how to handle line %r" % line)
     return entry
 
 if __name__ == '__main__':
     data = {}
 
     popcon_versions = {}
-    timestamps = sets.Set()
+    timestamps = set()
 
     for f in sys.argv[1:]:
         file_reg = file_regex.match(f)