[Secure-testing-commits] r5639 - lib/python

[Florian Weimer]

Author: fw
Date: 2007-04-09 11:27:01 +0000 (Mon, 09 Apr 2007)
New Revision: 5639

Modified:
   lib/python/security_db.py
Log:
* lib/python/security_db.py (DB._initViews):
  Adjust SQL for the testing_status view to what's actually
  in the database.


Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2007-04-09 08:52:29 UTC (rev 5638)
+++ lib/python/security_db.py	2007-04-09 11:27:01 UTC (rev 5639)
@@ -365,10 +365,6 @@
             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 = 'lenny')) AS no_dsa
             FROM source_packages AS tsecp, source_package_status AS tsecst
             WHERE tsecp.name = sp.name
             AND tsecp.release = 'lenny' AND tsecp.subrelease = 'security'
@@ -376,12 +372,16 @@
             AND tsecst.bug_name = st.bug_name
             AND tsecst.package = tsecp.rowid), 0) AS testing_security_fixed,
             (SELECT range_remote FROM nvd_data
-             WHERE cve_name = st.bug_name) AS remote
+             WHERE cve_name = st.bug_name) AS remote,
+            (EXISTS (SELECT * FROM package_notes_nodsa AS pnd
+            WHERE pnd.bug_name = st.bug_name
+            AND pnd.package = sp.name
+            AND pnd.release = 'lenny')) AS no_dsa
             FROM source_package_status AS st, source_packages AS sp
             WHERE st.vulnerable AND st.urgency <> 'unimportant'
             AND sp.rowid = st.package AND sp.release = 'lenny'
             AND sp.subrelease = ''
-            ORDER BY sp.name, urgency_to_number(st.urgency), st.bug_name""")
+            ORDER BY sp.name, st.urgency, st.bug_name""")
 
         for (name, nickname) in (('stable', 'etch'), ('oldstable', 'sarge')):
             cursor.execute(