Secure testing commits - Dec 2005 - r3131 - lib/python

Author: fw
Date: 2005-12-23 14:10:50 +0000 (Fri, 23 Dec 2005)
New Revision: 3131

Modified:
   lib/python/security_db.py
Log:
lib/python/security_db.py (DB.calculateDebsecan1):
  Rework maximum urgency calculation.  "unknown" no longer
  overrides other urgencies.


Modified: lib/python/security_db.py
==================================================================---
lib/python/security_db.py	2005-12-23 13:59:19 UTC (rev 3130)
+++ lib/python/security_db.py	2005-12-23 14:10:50 UTC (rev 3131)
@@ -1406,7 +1406,7 @@
                 ORDER BY package, bug_name""")):
 
                 unstable_fixed = ''0''
-                total_urgency = ''''
+                total_urgency = ''unknown''
                 other_versions = {}
                 is_binary = False
                 is_unknown = False
@@ -1415,13 +1415,11 @@
                     """SELECT release, package_kind, urgency,
fixed_version
                     FROM package_notes WHERE bug_name = ? AND package =
?""",
                     (bug, package))):
-                    if total_urgency:
-                        if urgency == ''unknown'':
+                    if total_urgency <> ''unknown'':
+                        if urgency <> ''unknown'' \
+                               and bugs.internUrgency(urgency) \
+                               > bugs.internUrgency(total_urgency):
                             total_urgency = urgency
-                        elif total_urgency <> ''unknown''
\
-                                 and bugs.internUrgency(urgency) \
-                                 > bugs.internUrgency(total_urgency):
-                            total_urgency = urgency
                     else:
                         total_urgency = urgency