[Secure-testing-commits] r31665 - bin

[Thijs Kinkhorst]

Author: thijs
Date: 2015-01-25 13:39:30 +0000 (Sun, 25 Jan 2015)
New Revision: 31665

Modified:
   bin/tracker_service.py
Log:
Fix links to source packages in non-main


Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2015-01-25 13:31:39 UTC (rev 31664)
+++ bin/tracker_service.py	2015-01-25 13:39:30 UTC (rev 31665)
@@ -663,8 +663,9 @@
                     pkg_name = ''
                 else:
                     old_pkg_name = pkg_name
+                    title = None
                     if archive <> 'main':
-                        pkg_name = "%s (%s)" % (pkg_name, archive)
+                        title = "%s (%s)" % (pkg_name, archive)
 
                 if remote is None:
                     remote = '?'
@@ -681,7 +682,7 @@
                     if no_dsa:
                         urgency = urgency + '*'
 
-                yield self.make_source_package_ref(url, pkg_name, pkg_name), self.make_xref(url, bug_name), urgency, remote
+                yield self.make_source_package_ref(url, pkg_name, title), self.make_xref(url, bug_name), urgency, remote
 
         return self.create_page(
             url, 'Vulnerable source packages in the %s suite' % release,
@@ -719,8 +720,9 @@
                     pkg_name = ''
                 else:
                     old_pkg_name = pkg_name
+                    title = None
                     if archive <> 'main':
-                        pkg_name = "%s (%s)" % (pkg_name, archive)
+                        title = "%s (%s)" % (pkg_name, archive)
 
                 if remote is None:
                     remote = '?'
@@ -742,7 +744,7 @@
                 elif vulnerable == 2:
                     urgency = self.make_purple(urgency)
 
-                yield (self.make_source_package_ref(url, pkg_name, pkg_name), self.make_xref(url, bug_name),
+                yield (self.make_source_package_ref(url, pkg_name, title), self.make_xref(url, bug_name),
                        urgency, remote, status)
 
         return self.create_page(
@@ -778,10 +780,9 @@
                     pkg_name = ''
                 else:
                     old_pkg_name = pkg_name
+                    title = None
                     if section <> 'main':
-                        pkg_name = "%s (%s)" % (pkg_name, section)
-                    else:
-                        pkg_name = self.make_xref(url, pkg_name)
+                        title = "%s (%s)" % (pkg_name, section)
 
                 if remote is None:
                     remote = '?'
@@ -795,7 +796,7 @@
                 elif vulnerable == 2:
                     urgency = self.make_purple(urgency)
 
-                yield pkg_name, self.make_xref(url, bug_name), urgency, remote
+                yield self.make_source_package_ref(url, pkg_name, title), self.make_xref(url, bug_name), urgency, remote
 
         return self.create_page(
             url, title,
@@ -860,12 +861,11 @@
                     migration = ''
                 else:
                     old_pkg_name = pkg_name
+                    title = None
                     migration = A(self.url_testing_status(url, pkg_name),
                                   "check")
                     if archive <> 'main':
-                        pkg_name = "%s (%s)" % (pkg_name, archive)
-                    else:
-                        pkg_name = self.make_source_package_ref(url, pkg_name)
+                        title = "%s (%s)" % (pkg_name, archive)
 
                 if remote is None:
                     remote = '?'
@@ -884,7 +884,7 @@
                 else:
                     notes = ''
 
-                yield (pkg_name, migration, self.make_xref(url, bug_name),
+                yield (self.make_source_package_ref(url, pkg_name, title), migration, self.make_xref(url, bug_name),
                        urgency, remote, notes)
 
         return self.create_page(