script logic updates

git-svn-id: svn+ssh://svn.debian.org/svn/kernel-sec@957 e094ebfe-e918-0410-adfb-c712417f3574

2 files changed, 15 insertions, 13 deletions

diff --git a/active/CVE-2007-4573 b/active/CVE-2007-4573
index 33c13365..e1e35868 100644
--- a/active/CVE-2007-4573
+++ b/active/CVE-2007-4573
@@ -10,6 +10,6 @@ linux-2.6:
 2.6.18-etch-security: 
 2.6.8-sarge-security: 
 2.4.27-sarge-security: 
-2.6.15-dapper-security: 
-2.6.17-edgy-security: 
-2.6.20-feisty-security: 
+2.6.15-dapper-security: needed
+2.6.17-edgy-security: needed
+2.6.20-feisty-security: needed
diff --git a/scripts/ubuntu-table b/scripts/ubuntu-table
index 116c499e..8153fb26 100755
--- a/scripts/ubuntu-table
+++ b/scripts/ubuntu-table
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import os, re
+import os, re, sys
 
 releases = ['2.6.15-dapper-security', '2.6.17-edgy-security', '2.6.20-feisty-security']
 
@@ -15,6 +15,8 @@ for cve in cves:
             state = status.group(1)
             if state == '':
                 state = 'needs triage'
+            if state == 'ignore':
+                state = 'ignored'
             table[cve][rel] = state
 
 format = '%15s'
@@ -24,21 +26,21 @@ for rel in releases:
 print
 
 for cve in cves:
-    nodisplay = 1
-    ignored = 1
     needed = 0
     released = 0
+    action_required = 0
     for rel in releases:
-        if table[cve][rel] != 'N/A' and table[cve][rel] != 'released' and table[cve][rel] != '-unlisted-':
-            nodisplay = 0
-        if table[cve][rel] != 'ignored':
-            ignored = 0
-        if table[cve][rel] == 'needed' or table[cve][rel] == 'deferred':
+        if not table[cve][rel] in ('N/A', 'ignored', '-unlisted-', 'needs triage', 'needed', 'deferred', 'pending', 'released'):
+            print 'Unknown state: %s' % (table[cve][rel])
+            sys.exit(1)
+        if table[cve][rel] in ('needed','deferred'):
             needed = 1
-        if table[cve][rel] == 'released':
+        if table[cve][rel] in ('released'):
             released = 1
+        if table[cve][rel] in ('needed','pending','deferred','needs triage'):
+            action_required = 1
 
-    if not nodisplay and not ignored:
+    if action_required:
         print '%s: ' % cve, 
         for rel in releases:
             print format % table[cve][rel],