Author: gilbert-guest
Date: 2011-02-25 22:33:50 +0000 (Fri, 25 Feb 2011)
New Revision: 16254
Modified:
bin/tracker_service.py
lib/python/security_db.py
Log:
revert use of nvd text in all descriptions (closes: #614887)
Modified: bin/tracker_service.py
==================================================================---
bin/tracker_service.py 2011-02-25 21:29:13 UTC (rev 16253)
+++ bin/tracker_service.py 2011-02-25 22:33:50 UTC (rev 16254)
@@ -327,14 +327,17 @@
if source_xref:
yield B("Source"), source_xref
- if bug.description:
+ nvd = self.db.getNVD(cursor, bug.name)
+
+ if nvd and nvd.cve_desc:
+ yield B("Description"), nvd.cve_desc
+ elif 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-25 21:29:13 UTC (rev 16253)
+++ lib/python/security_db.py 2011-02-25 22:33:50 UTC (rev 16254)
@@ -1064,12 +1064,6 @@
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.