[Secure-testing-commits] r29026 - bin lib/python

[Holger Levsen]

Author: holger
Date: 2014-09-25 07:36:54 +0000 (Thu, 25 Sep 2014)
New Revision: 29026

Modified:
   bin/tracker_service.py
   lib/python/bugs.py
   lib/python/security_db.py
Log:
Display end-of-life information in the web view. (Closes: #642987) -
abuses urgency for now, until the packages_notes table has a tag
column.

Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2014-09-25 04:33:29 UTC (rev 29025)
+++ bin/tracker_service.py	2014-09-25 07:36:54 UTC (rev 29026)
@@ -29,6 +29,7 @@
                            ('low_urgency', 'low', 'urgency'),
                            ('unimportant_urgency', 'unimportant', 'urgency'),
                            ('unassigned_urgency', 'not yet assigned', 'urgency'),
+                           ('endoflife_urgency', 'end-of-life', 'urgency'),
 
                            ('remote', 'hide remote scope', 'scope'),
                            ('local', 'hide local scope', 'scope'),
@@ -76,7 +77,9 @@
                     and urg == 'unimportant'
         filteruna = not self.params['unassigned_urgency'] \
                     and urg ==  'not yet assigned'
-        return filterlow or filtermed or filterhigh or filterund or filteruni or filteruna
+        filterend = not self.params['endoflife_urgency'] \
+                    and urg == 'end-of-life'
+        return filterlow or filtermed or filterhigh or filterund or filteruni or filteruna or filterend
 
     def remoteFiltered(self, remote):
 	filterr = self.params['remote'] and remote and remote is not None
@@ -420,6 +423,8 @@
                     else:
                         rel = '(unstable)'
                     urgency = str(n.urgency)
+		    if urgency == 'end-of-life':
+			urgency = self.make_purple('end-of-life')
                     if n.fixed_version:
                         ver = str(n.fixed_version)
                         if ver == '0':

Modified: lib/python/bugs.py
===================================================================
--- lib/python/bugs.py	2014-09-25 04:33:29 UTC (rev 29025)
+++ lib/python/bugs.py	2014-09-25 07:36:54 UTC (rev 29026)
@@ -24,7 +24,7 @@
 
 def listUrgencies():
     urgencies = {}
-    urgs = ('high', 'medium', 'low', 'unimportant', 'not yet assigned')
+    urgs = ('high', 'medium', 'low', 'unimportant', 'end-of-life', 'not yet assigned')
     for u in range(len(urgs)):
         urgencies[urgs[u]] = Urgency(urgs[u], -u)
     Urgency.urgencies = urgencies
@@ -579,7 +579,7 @@
                                 comments.append(('NOTE', r))
                         elif v == 'end-of-life':
                             pkg_notes.append(PackageNoteParsed
-                                             (p, '0', 'unimportant',
+                                             (p, None, 'end-of-life',
                                               release=release))
                             if d:
                                 # Not exactly ideal, but we have to

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2014-09-25 04:33:29 UTC (rev 29025)
+++ lib/python/security_db.py	2014-09-25 07:36:54 UTC (rev 29026)
@@ -1290,7 +1290,8 @@
                 AND n.id = vulnlist.note
                 ORDER BY vulnlist.package""")):
             if fixed_version == '0' or urgency == 'unimportant' \
-               or kind not in ('source', 'binary', 'unknown'):
+                    or urgency == 'end-of-life' \
+                    or kind not in ('source', 'binary', 'unknown'):
                 continue
 
             # Normalize FAKE-* names a bit.  The line number (which
@@ -1485,7 +1486,8 @@
                 # packages as vulnerable.  (If unstable_fixed == '0',
                 # release-specific annotations cannot create
                 # vulnerabilities, either.)
-                if total_urgency == 'unimportant' or unstable_fixed == '0':
+                if total_urgency == 'unimportant' or unstable_fixed == '0' \
+                        or total_urgency == 'end-of-life':
                     continue
 
                 if unstable_fixed is None: