lib/python/security_db.py: pass all TEMP bug names to debsecan

They are somewhat stable now, and therefore actually useful.


git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@15863 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 1 insertions, 14 deletions

diff --git a/lib/python/security_db.py b/lib/python/security_db.py
index 7720a2d0f3..030fd77872 100644
--- a/lib/python/security_db.py
+++ b/lib/python/security_db.py
@@ -1249,8 +1249,6 @@ class DB:
         else:
             release = 'sid'
 
-        c.execute("""DELETE FROM vulnlist WHERE name LIKE 'TEMP-0000000-%'""")
-
         urgency_to_flag = {'low' : 'L', 'medium' : 'M', 'high' : 'H',
                            'not yet assigned' : ' '}
 
@@ -1347,7 +1345,6 @@ class DB:
                  WHERE cve_name = p.bug_name)
                 FROM package_notes AS p, bugs AS b
                 WHERE (p.bug_name LIKE 'CVE-%' OR p.bug_name LIKE 'TEMP-%')
-                AND p.bug_name NOT LIKE 'TEMP-0000000-%'
                 AND p.urgency <> 'unimportant'
                 AND COALESCE(p.fixed_version, '') <> '0'
                 AND p.package_kind IN ('source', 'binary', 'unknown')
@@ -1360,16 +1357,7 @@ class DB:
                 else:
                     remote = ' '
 
-                # Normalize FAKE-* names a bit.  The line number (which
-                # makes the name unique) is completely useless for the
-                # client.
-
-                if bug[0:5] == 'TEMP-':
-                    name = '-'.join(bug.split('-')[0:2])
-                else:
-                    name = bug
-
-                result_start.append("%s,,%s" % (name, desc))
+                result_start.append("%s,,%s" % (bug, desc))
                 bug_to_index[bug] = index
                 bug_to_remote_flag[bug] = remote
                 index += 1
@@ -1386,7 +1374,6 @@ class DB:
                 """SELECT DISTINCT bug_name, package
                 FROM package_notes
                 WHERE (bug_name LIKE 'CVE-%' OR bug_name LIKE 'TEMP-%')
-                AND bug_name NOT LIKE 'TEMP-0000000-%'
                 AND package_kind IN ('source', 'binary', 'unknown')
                 GROUP BY package, bug_name
                 ORDER BY package, bug_name""")):