From e243494f2ff29c946db43ba40ae800bf86cca808 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 12 Feb 2023 23:15:34 +0000 Subject: Rework how 'OBSOLETE' is handled in package list Previously, we'd do some rearrangement of the release area, so the obsoleted package would be moved under the obsoleting package, so it didn't need to exist at all in the package list and we could safely ignore it. We don't need or want to bother with that now, so let obsolete packages paths exist. Future work: This needs some thought about how we want to work. Perhaps prohibit uploads? Perhaps error if the package marked OBSOLETE isn't actually obsoleted by something? --- calm/maintainers.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/calm/maintainers.py b/calm/maintainers.py index cc75040..d0497cb 100644 --- a/calm/maintainers.py +++ b/calm/maintainers.py @@ -168,9 +168,13 @@ def _read_pkglist(pkglist): if status_match: status = status_match.group(1) - # ignore packages marked as 'OBSOLETE' + # packages marked as 'OBSOLETE' are obsolete if status == 'OBSOLETE': - continue + # obsolete packages have no maintainer + # + # XXX: perhaps disallow even trusties to upload (or + # warn if they try?) + m = '' # orphaned packages are assigned to 'ORPHANED' elif status == 'ORPHANED': @@ -190,6 +194,9 @@ def _read_pkglist(pkglist): # joint maintainers are separated by '/' maintainers = list() for name in m.split('/'): + if not name: + continue + name = name.strip() # is the maintainer name ascii? -- cgit v1.2.3