[Secure-testing-commits] r2178 - lib/python

[Florian Weimer]

Author: fw
Date: 2005-09-25 17:55:07 +0000 (Sun, 25 Sep 2005)
New Revision: 2178

Modified:
   lib/python/bugs.py
Log:
lib/python/bugs.py (FileBase):
  Make package note regexps more strict.
(FileBase.rawRecords):
  Patch in the new-format "NOT-FOR-US:" entries for old entries.



Modified: lib/python/bugs.py
===================================================================
--- lib/python/bugs.py	2005-09-25 17:49:29 UTC (rev 2177)
+++ lib/python/bugs.py	2005-09-25 17:55:07 UTC (rev 2178)
@@ -496,13 +496,12 @@
     re_xref_fixedby_required = re.compile(r'^FIXED-BY')
     re_xref_fixedby = re.compile(r'^FIXED-BY:\s+(.*?)\s*$')
     
-    # temporary hack, until we know what "!" actually means.
-    re_package_required = re.compile(r'^(?:\[.*\]\s*)?[-!]')
+    re_package_required = re.compile(r'^(?:\[.*\]\s*)?-')
     re_package_version = re.compile(
-        r'^(?:\[([a-z]+)\] )?[-!] ([A-Za-z0-9:.+-]+)\s*'
+        r'^(?:\[([a-z]+)\] )?- ([A-Za-z0-9:.+-]+)\s*'
         + r'(?:\s([A-Za-z0-9:.+-]+)\s*)?(?:\s\((.*)\))?$')
     re_package_no_version = re.compile(
-        r'^(?:\[([a-z]+)\] )?[-!] ([A-Za-z0-9:.+-]+)'
+        r'^(?:\[([a-z]+)\] )?- ([A-Za-z0-9:.+-]+)'
         + r'\s+<([a-z-]+)>\s*(?:\s\((.*)\))?$')
     re_not_for_us_required = re.compile(r'^NOT-FOR-US:')
     re_not_for_us = re.compile(r'^NOT-FOR-US:\s+(.*?)\s*$')
@@ -585,7 +584,7 @@
             if after_stop and len(record) == 0:
                 # Patch in not-for-us field, so that bugs after STOP:
                 # are ignored.
-                record = [(first_line, 'NOTE: not-for-us (entry too old)')]
+                record = [(first_line, 'NOT-FOR-US: entry too old')]
 
             yield (first_line, date, record_name, description, record)