From 1e16eb115b67f70c293860d54ef399dd35d81d33 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Thu, 6 Apr 2023 16:59:14 +0100 Subject: Add obsoletes_by to package summary page It would be nice to also show rdepends and rbuild_depends, but those could be huge lists. --- calm/pkg2html.py | 16 +++++++++++----- test/testdata/htdocs.expected/summary/obs-a.html | 1 + test/testdata/htdocs.expected/summary/obs-b.html | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/calm/pkg2html.py b/calm/pkg2html.py index ee8fdea..a4cd59a 100755 --- a/calm/pkg2html.py +++ b/calm/pkg2html.py @@ -212,7 +212,9 @@ def update_package_listings(args, packages): if po.kind == package.Kind.source: details = ['build-depends'] else: - details = ['depends', 'obsoletes', 'provides', 'conflicts'] + details = ['depends', 'obsoletes', 'obsoleted_by', 'provides', 'conflicts'] + + detail_is_attr = ['obsoleted_by'] for key in details: # make the union of the package list for this detail @@ -221,11 +223,15 @@ def update_package_listings(args, packages): value = {} values = set() for arch in pos: - t = pos[arch].version_hints[pos[arch].best_version].get(key, None) - if t: - value[arch] = set(t.split(', ')) + if key in detail_is_attr: + value[arch] = getattr(pos[arch], key, set()) else: - value[arch] = set() + t = pos[arch].version_hints[pos[arch].best_version].get(key, None) + + if t: + value[arch] = set(t.split(', ')) + else: + value[arch] = set() values.update(value[arch]) if values: diff --git a/test/testdata/htdocs.expected/summary/obs-a.html b/test/testdata/htdocs.expected/summary/obs-a.html index 32c9da9..c7164d7 100644 --- a/test/testdata/htdocs.expected/summary/obs-a.html +++ b/test/testdata/htdocs.expected/summary/obs-a.html @@ -13,6 +13,7 @@ summary: obsolete package A

description: obsolete package A

categories: Devel

+obsoleted_by: test-c

source package: obs-a

maintainer(s): ORPHANED (Use the mailing list to report bugs or ask questions. diff --git a/test/testdata/htdocs.expected/summary/obs-b.html b/test/testdata/htdocs.expected/summary/obs-b.html index 935c0c5..a560262 100644 --- a/test/testdata/htdocs.expected/summary/obs-b.html +++ b/test/testdata/htdocs.expected/summary/obs-b.html @@ -13,6 +13,7 @@ summary: obsolete package B

description: obsolete package B

categories: Devel

+obsoleted_by: test-c

source package: obs-b

maintainer(s): ORPHANED (Use the mailing list to report bugs or ask questions. -- cgit v1.2.3