diff options
| author | Emilio Pozuelo Monfort <pochu@debian.org> | 2020-12-01 14:15:55 +0100 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <pochu@debian.org> | 2020-12-02 09:32:39 +0100 |
| commit | f16a2a47dbea736d58438c0fba515533eb400b08 (patch) | |
| tree | b1b15e6c88aeeb4408f03e63973994c2fcfde2e6 /lib | |
| parent | 7f76b53e429065e3ebf8afdfdb91bc716df79b1f (diff) | |
sectracker.parsers: be explicit when building PackageAnnotations
In some cases we are intentionally passing versions as kinds or
kinds as versions, and making it explicit makes it less confusing.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/sectracker/parsers.py | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/lib/python/sectracker/parsers.py b/lib/python/sectracker/parsers.py index b97ed1877d..42e7da75cb 100644 --- a/lib/python/sectracker/parsers.py +++ b/lib/python/sectracker/parsers.py @@ -132,8 +132,15 @@ def _annotationdispatcher(): else: kind = "fixed" return PackageAnnotation( - diag.line(), "package", release, package, kind, - version, None, flags) + line=diag.line(), + type="package", + release=release, + package=package, + kind=kind, + version=version, + description=None, + flags=flags, + ) pseudo_freetext = "no-dsa not-affected end-of-life ignored postponed".split() pseudo_struct = set("unfixed removed itp undetermined".split()) @@ -143,15 +150,29 @@ def _annotationdispatcher(): release, package, version, inner = groups if version in pseudo_freetext: return PackageAnnotation( - diag.line(), "package", release, package, version, - None, inner, []) + line=diag.line(), + type="package", + release=release, + package=package, + kind=version, + version=None, + description=inner, + flags=[], + ) elif version in pseudo_struct: flags = parseinner(diag, inner) if version == "itp" and not inner[1]: diag.error("<itp> needs Debian bug reference") return PackageAnnotation( - diag.line(), "package", release, package, version, - None, None, flags) + line=diag.line(), + type="package", + release=release, + package=package, + kind=version, + version=None, + description=None, + flags=flags, + ) else: diag.error("invalid pseudo-version: " + repr(version)) return None |