diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2023-02-13 02:15:34 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2023-02-19 20:03:10 +0300 |
| commit | e243494f2ff29c946db43ba40ae800bf86cca808 (patch) | |
| tree | d52d8f539fc72fb2bf4e82f91f54cd3aa26dd007 | |
| parent | 55d44e25c32ada23cebf5ed77ea013030d0dc490 (diff) | |
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?
| -rw-r--r-- | calm/maintainers.py | 11 |
1 files 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? |