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

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-02-13 22:45:52 +0000 (Sun, 13 Feb 2011)
New Revision: 16133

Modified:
   bin/tracker_service.py
   lib/python/security_db.py
Log:
use nvd text in all descriptions

Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2011-02-13 21:48:28 UTC (rev 16132)
+++ bin/tracker_service.py	2011-02-13 22:45:52 UTC (rev 16133)
@@ -327,17 +327,14 @@
             if source_xref:
                 yield B("Source"), source_xref
         
-            nvd = self.db.getNVD(cursor, bug.name)
-
-            if nvd and nvd.cve_desc:
-                yield B("Description"), nvd.cve_desc
-            elif bug.description:
+            if bug.description:
                 yield B("Description"), bug.description
 
             xref = list(self.db.getBugXrefs(cursor, bug.name))
             if xref:
                 yield B("References"), self.make_xref_list(url, xref)
 
+            nvd = self.db.getNVD(cursor, bug.name) 
             if nvd:
                 nvd_range = nvd.rangeString()
                 if nvd.severity:

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2011-02-13 21:48:28 UTC (rev 16132)
+++ lib/python/security_db.py	2011-02-13 22:45:52 UTC (rev 16133)
@@ -1063,6 +1063,12 @@
             FROM nvd_data AS n, package_notes AS p
             WHERE p.bug_name == n.cve_name
             AND p.urgency == 'not yet assigned'""")
+        cursor.execute(
+            """REPLACE INTO bugs
+            SELECT b.name, b.cve_status, b.not_for_us, n.cve_desc,
+            b.release_date, b.source_file, b.source_line
+            FROM nvd_data AS n, bugs AS b
+            WHERE n.cve_name = b.name AND n.cve_desc <> ''""")
 
         # Calculate the release-specific bug status.