[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20220704-5-g7525e8a

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20220704-5-g7525e8a

[Jon TURNEY]

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

commit 7525e8aaa9979436a1ff9c319c1e95c1c9a6598f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat Jul 16 19:56:28 2022 +0100

    Fix BufferingSMTPHandler used as a context
    
    Since a1cb1581, BufferingSMTPHandler was used directly as a context to
    send an unhandled exception termination report email, but that class
    doesn't support such use...

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

commit 3208633a6de90abb61ff737d0b6fc994c65ea3a9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jul 10 15:56:11 2022 +0100

    Add a reminder that procps-ng obsoletes procps at upload

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

commit ba0fd5ebe9cfd0cbd8d9b96fc728d3f3de80c9dd
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jul 10 15:53:49 2022 +0100

    Only count rdepends with a different source in deprecated soversion report

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

commit 6d1a532ceda80b6c3d483dc29f45c3de5d11e66a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jul 10 13:56:11 2022 +0100

    Add package timestamp to deprecated soversion report

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

commit 4e30ad12b5bebb1ffa0b1ca65dd9c3a255632395
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Jun 30 15:58:47 2022 +0100

    Wind forward deprecated solib age threshold


Diff:
---
 calm/buffering_smtp_handler.py |  4 ++++
 calm/package.py                |  2 +-
 calm/past_mistakes.py          |  1 +
 calm/reports.py                | 10 +++++-----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/calm/buffering_smtp_handler.py b/calm/buffering_smtp_handler.py
index b7dfee7..2d764ae 100644
--- a/calm/buffering_smtp_handler.py
+++ b/calm/buffering_smtp_handler.py
@@ -95,3 +95,7 @@ class BufferingSMTPHandler(logging.handlers.BufferingHandler):
         # the capacity we pass to BufferingHandler is irrelevant since we
         # override shouldFlush so it never indicates we have reached capacity
         return False
+
+    def __enter__(self):
+        logging.getLogger().addHandler(self)
+        return self
diff --git a/calm/package.py b/calm/package.py
index 32b4d31..14295af 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -1431,7 +1431,7 @@ def mark_package_fresh(packages, p, v, mark=Freshness.fresh):
 # construct a move list of stale packages
 #
 
-SO_AGE_THRESHOLD_YEARS = 10
+SO_AGE_THRESHOLD_YEARS = 5
 
 
 def stale_packages(packages):
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index c0e724f..e4135aa 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -182,6 +182,7 @@ missing_obsolete = {
     'guile2.2-debuginfo': ['guile-debuginfo'],
     'librsync-debuginfo': ['rdiff-debuginfo'],
     'man-db-debuginfo': ['man-debuginfo'],        # contain conflicting files
+    'procps-ng': ['procps'],
     'procps-ng-debuginfo': ['procps-debuginfo'],  # contain conflicting files
     'python2-debuginfo': ['python-debuginfo'],    # contain conflicting files
     'python-dbus-debuginfo': ['python3-dbus-debuginfo'],
diff --git a/calm/reports.py b/calm/reports.py
index df8e455..2eb1455 100644
--- a/calm/reports.py
+++ b/calm/reports.py
@@ -165,7 +165,8 @@ def deprecated(args, packages, reportsdir):
         depp.po = po
         depp.v = bv
         depp.ts = po.tar(bv).mtime
-        depp.rdepends = len(po.rdepends)
+        # number of rdepends which have a different source package
+        depp.rdepends = len(list(p for p in po.rdepends if packages[arch][p].srcpackage(packages[arch][p].best_version) != es))
 
         dep_list.append(depp)
 
@@ -175,12 +176,11 @@ def deprecated(args, packages, reportsdir):
     newer soversion, or has stopped producing this soversion).</p>'''), file=body)
 
     print('<table class="grid">', file=body)
-    print('<tr><th>package</th><th>version</th><th>rdepends</th></tr>', file=body)
+    print('<tr><th>package</th><th>version</th><th>timestamp</th><th>rdepends</th></tr>', file=body)
 
     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.po), depp.v, depp.rdepends), file=body)
+        print('<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>' %
+              (linkify(depp.pn, depp.po), depp.v, pkg2html.tsformat(depp.ts), depp.rdepends), file=body)
 
     print('</table>', file=body)