Author: fw Date: 2010-05-07 20:38:40 +0000 (Fri, 07 May 2010) New Revision: 14627 Modified: lib/python/parsers.py Log: parsers.cvelist(): fix end-of-life handling Modified: lib/python/parsers.py ==================================================================--- lib/python/parsers.py 2010-05-07 20:37:27 UTC (rev 14626) +++ lib/python/parsers.py 2010-05-07 20:38:40 UTC (rev 14627) @@ -148,8 +148,8 @@ *((line, "package", release, package, kind, version, None) + inner))) - pseudo_freetext = "no-dsa not-affected".split() - pseudo_struct = set("unfixed removed end-of-life itp undetermined".split()) + pseudo_freetext = "no-dsa not-affected end-of-life".split() + pseudo_struct = set("unfixed removed itp undetermined".split()) @regexpcase.rule(r''(?:\[([a-z]+)\]\s)?-\s([A-Za-z0-9:.+-]+)'' + r''\s+<([a-z-]+)>\s*(?:\s\((.*)\))?'') def package_pseudo(groups, file, line, messages, anns): @@ -319,6 +319,10 @@ ('' [lenny] - foo <no-dsa> (explanation goes here)'', PackageAnnotation(17, "package", "lenny", "foo", "no-dsa", None, "explanation goes here", None, (), False), ()), + ('' [lenny] - foo <end-of-life> (explanation goes here)'', + PackageAnnotation(17, "package", "lenny", "foo", "end-of-life", + None, "explanation goes here", None, (), False), + ()), ('' [lenny] - foo <not-affected> (explanation goes here)'', PackageAnnotation(17, "package", "lenny", "foo", "not-affected", None,