[Secure-testing-commits] r33088 - bin

[Holger Levsen]

Author: holger
Date: 2015-03-23 19:17:58 +0000 (Mon, 23 Mar 2015)
New Revision: 33088

Modified:
   bin/tracker_service.py
Log:
json/#761859: drop repositories dict per issue, instead add repositories dict per release per issue.

Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2015-03-23 19:12:41 UTC (rev 33087)
+++ bin/tracker_service.py	2015-03-23 19:17:58 UTC (rev 33088)
@@ -1337,7 +1337,6 @@
                 description = None
                 debianbug = None
                 scope = None
-                repo = {}
                 suites = {}
 
                 if descriptions[issue]:
@@ -1350,13 +1349,12 @@
                     scope = "remote"
                 else:
                     scope = "local"
-                for repository in repositories[pkg][issue]:
-                    repo[repository] = version [pkg][issue][repository]
                 for release in releases[pkg][issue]:
                     state = None
-                    suite_version = None
+                    suite_fixed_version = None
                     suite_urgency = None
                     suite_nodsa = None
+                    suite_repositories = {}
                     winner=''
                     for suffix in ('','-security','-lts'):
                         subrelease=release+suffix
@@ -1373,18 +1371,23 @@
                     if status[pkg][issue][repository] != 0:
                         # 1 = vulnerable, 2 = undetermined
                         state = "open"
-                        suite_version = version[pkg][issue][repository]
                         fixed_since = None
                     else:
                         state = "resolved"
-                        suite_version = fixed_version[pkg][issue][repository]
+                        suite_fixed_version = fixed_version[pkg][issue][repository]
                         fixed_since = repository
                     suite_urgency = urgency[pkg][issue][repository]
                     if nodsa[pkg][issue].has_key(repository):
                         suite_nodsa = nodsa[pkg][issue][repository]
+                    for repository in repositories[pkg][issue]:
+                        for suffix in ('','-security','-lts'):
+                            subrelease=release+suffix
+                            if version[pkg][issue].has_key(subrelease):
+                                suite_repositories[subrelease] = version[pkg][issue][subrelease]
                     suites[release] = { "status": state,
+                                        "repositories": suite_repositories,
                                         "fixed_since" : fixed_since,
-                                        "version": suite_version,
+                                        "fixed_version" : suite_fixed_version,
                                         "urgency": suite_urgency,
                                         "nodsa": suite_nodsa }
                     clean_dict(suites[release])
@@ -1392,7 +1395,6 @@
                               "description": description,
                               "debianbug": debianbug,
                               "scope": scope,
-                              "repositories": repo,
                               "releases": suites }
                 clean_dict(pkg_issue)