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

[Florian Weimer]

Author: fw
Date: 2006-12-10 18:35:42 +0100 (Sun, 10 Dec 2006)
New Revision: 5100

Modified:
   bin/tracker_service.py
   lib/python/security_db.py
Log:
Add a no-dsa filter to the "testing" web page

lib/python/security_db.py (DB._initViews):
  Add no_dsa column to the testing_status table.

bin/tracker_service.py (TrackerService.page_status_release_testing):
  Use it to implement the filter in the same way as for "stable".


Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2006-12-10 12:06:58 UTC (rev 5099)
+++ bin/tracker_service.py	2006-12-10 17:35:42 UTC (rev 5100)
@@ -644,19 +644,22 @@
                                                          params, url)
             
     def page_status_release_testing(self, path, params, url):
-        bf = BugFilter(params)
+        bf = BugFilterNoDSA(params)
 
         def gen():
             old_pkg_name = ''
             for (pkg_name, bug_name, archive, urgency,
-                 sid_vulnerable, ts_fixed, remote) in self.db.cursor().execute(
+                 sid_vulnerable, ts_fixed, remote, no_dsa) \
+                 in self.db.cursor().execute(
                 """SELECT package, bug, section, urgency, unstable_vulnerable,
-                testing_security_fixed, remote
+                testing_security_fixed, remote, no_dsa
                 FROM testing_status"""):
                 if bf.urgencyFiltered(urgency):
                     continue
                 if bf.remoteFiltered(remote):
                     continue
+                if bf.nodsaFiltered(no_dsa):
+                    continue
 
                 if pkg_name == old_pkg_name:
                     pkg_name = ''

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2006-12-10 12:06:58 UTC (rev 5099)
+++ lib/python/security_db.py	2006-12-10 17:35:42 UTC (rev 5100)
@@ -365,6 +365,10 @@
             AND sidst.bug_name = st.bug_name
             AND sidst.package = sidp.rowid) AS unstable_vulnerable,
             COALESCE((SELECT NOT vulnerable
+            (EXISTS (SELECT * FROM package_notes_nodsa AS pnd
+            WHERE pnd.bug_name = st.bug_name
+            AND pnd.package = sp.name
+            AND pnd.release = 'etch')) AS no_dsa
             FROM source_packages AS tsecp, source_package_status AS tsecst
             WHERE tsecp.name = sp.name
             AND tsecp.release = 'etch' AND tsecp.subrelease = 'security'