diff options
author | Salvatore Bonaccorso <carnil@debian.org> | 2014-09-01 05:06:14 +0000 |
---|---|---|
committer | Salvatore Bonaccorso <carnil@debian.org> | 2014-09-01 05:06:14 +0000 |
commit | 37744cbec4698973c688a4596612c21a5599cff8 (patch) | |
tree | ad48435a1009ba04fac4c4380aaaae98ccb0c5bd /lib/python/bugs.py | |
parent | 5cbb858955fe552fd59eed209037647777c1a69d (diff) |
Revert "add support for squeeze-lts (Closes: #759727 once Florian has applied this to soler.d.o)"
This reverts commit 6357e7f64b5cdab2f194dc5a1ae0ff309bb625f6.
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@28536 e39458fd-73e7-0310-bf30-c45bca0a0e42
Diffstat (limited to 'lib/python/bugs.py')
-rw-r--r-- | lib/python/bugs.py | 47 |
1 files changed, 3 insertions, 44 deletions
diff --git a/lib/python/bugs.py b/lib/python/bugs.py index 70108ffb43..49ccf04ab4 100644 --- a/lib/python/bugs.py +++ b/lib/python/bugs.py @@ -418,9 +418,9 @@ class FileBase(debian_support.PackageFile): re_whitespace = re.compile(r'\s+') re_xref_entry = re.compile('^(?:CVE-\d{4}-\d{4,}' + r'|VU#\d{6}' - + r'|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+|DLA-\d+-\d+)$') + + r'|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+)$') re_xref_entry_own = re.compile( - '^(?:CVE-\d{4}-\d{4,}|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+|DLA-\d+-\d+)$') + '^(?:CVE-\d{4}-\d{4,}|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+)$') re_package_required = re.compile(r'^(?:\[.*\]\s*)?-') re_package_version = re.compile( @@ -808,48 +808,7 @@ class DSAFile(FileBase): # Merge identical package notes, for historical reasons. bug.mergeNotes() return bug - -class DLAFile(FileBase): - """A DLA file. - - Similar to a CVE file, only that it contains DLAs as its main - reference point, and release dates. - """ - - re_dsa = re.compile(r'^\[(\d\d) ([A-Z][a-z][a-z]) (\d{4})\] ' - + r'(DLA-\d+(?:-\d+)?)\s+' - + r'(.*?)\s*$') - - month_names = {'Jan': 1, - 'Feb': 2, - 'Mar': 3, - 'Apr': 4, - 'May': 5, - 'Jun': 6, - 'Jul': 7, - 'Aug': 8, - 'Sep': 9, - 'Oct': 10, - 'Nov': 11, - 'Dec': 12} - - def matchHeader(self, line): - match = self.re_dsa.match(line) - if not match: - self.raiseSyntaxError("expected DLA record, got: %s" % `line`) - (record_name, description) = match.groups() - (day, month, year, name, desc) = match.groups() - try: - month = self.month_names[month] - except KeyError: - self.raiseSyntaxError("invalid month name %s" % `month`) - return ("%s-%02d-%s" % (year, month, day), name, desc) - - def finishBug(self, bug): - # Merge identical package notes, for historical reasons. - bug.mergeNotes() - return bug - + class DTSAFile(FileBase): """A DTSA file. |