From f16a2a47dbea736d58438c0fba515533eb400b08 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue, 1 Dec 2020 14:15:55 +0100
Subject: 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.
---
 lib/python/sectracker/parsers.py | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.3