[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20210626-15-g3e8e10f

Jon TURNEY via Cygwin-apps-cvs <[email protected]> Thu, 3 Feb 2022 13:34:59 +0000 (GMT)
Newsgroups	gmane.os.cygwin.cvs.apps
Message-ID	<[email protected]>


https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=3e8e10f195747de3bff5d32bc6b2d1cd67fb9b6c

commit 3e8e10f195747de3bff5d32bc6b2d1cd67fb9b6c
Author: Jon Turney <[email protected]>
Date:   Mon Jan 31 18:59:52 2022 +0000

    Include upstream version in 'unmaintained packages' report
    
    Fetch the upstream version from repology, and in include it in the
    'unmaintained packages' report.
    
    v2:
    Annotate packages in daemonized mode as well

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=e4b7bf3c372a06f994413200e00b49a9ae74f99c

commit e4b7bf3c372a06f994413200e00b49a9ae74f99c
Author: Jon Turney <[email protected]>
Date:   Mon Jan 31 15:36:57 2022 +0000

    Add 'deprecated shared libraries' report

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=2677eb4380ec544335aec40b71d12d723e76195d

commit 2677eb4380ec544335aec40b71d12d723e76195d
Author: Jon Turney <[email protected]>
Date:   Sat Jan 29 18:11:46 2022 +0000

    Add 'unmaintained packages' report


Diff:
---
 calm/reports.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/calm/reports.py b/calm/reports.py
index bf77f3f..2cd2308 100644
--- a/calm/reports.py
+++ b/calm/reports.py
@@ -41,7 +41,7 @@ def template(title, body, f):
     <!DOCTYPE html>
     <html>
     <head>
-    <link rel="stylesheet" type="text/css" href="/static/builds/style.css"/>
+    <link rel="stylesheet" type="text/css" href="/style.css"/>
     <title>{0}</title>
     </head>
     <body>
@@ -56,8 +56,8 @@ def template(title, body, f):
     </html>'''), file=f)
 
 
-def linkify(pn):
-    return '<a href="/packages/summary/{0}-src.html">{0}</a>'.format(pn)
+def linkify(pn, po):
+    return '<a href="/packages/summary/{0}.html">{1}</a>'.format(pn, po.orig_name)
 
 
 #
@@ -95,6 +95,7 @@ def unmaintained(args, packages, reportsdir):
             build_rdepends.update(packages[arch][subp].build_rdepends)
 
         up = types.SimpleNamespace()
+        up.pn = p
         up.po = po
         up.v = v
         up.upstream_v = getattr(po, 'upstream_version', 'unknown')
@@ -116,9 +117,8 @@ def unmaintained(args, packages, reportsdir):
     print('<tr><th>last updated</th><th>package</th><th>version</th><th>upstream version</th><th>rdepends</th><th>build_rdepends</th></tr>', file=body)
 
     for up in sorted(um_list, key=lambda i: (i.rdepends + i.build_rdepends, i.ts), reverse=True):
-        po = up.po
         print('<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>' %
-              (pkg2html.tsformat(up.ts), linkify(po.orig_name), up.v, up.upstream_v, up.rdepends, up.build_rdepends), file=body)
+              (pkg2html.tsformat(up.ts), linkify(up.pn, up.po), up.v, up.upstream_v, up.rdepends, up.build_rdepends), file=body)
 
     print('</table>', file=body)
 
@@ -175,7 +175,7 @@ def deprecated(args, packages, reportsdir):
     for depp in sorted(dep_list, key=lambda i: (i.rdepends, i.ts), reverse=True):
         po = depp.po
         print('<tr><td>%s</td><td>%s</td><td>%s</td></tr>' %
-              (linkify(depp.pn), depp.v, depp.rdepends), file=body)
+              (linkify(depp.pn, depp.po), depp.v, depp.rdepends), file=body)
 
     print('</table>', file=body)