[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20250329-44-gd66b519

[Jon Turney via Cygwin-apps-cvs]

Diff:
---
 calm/package.py       | 10 +++++-----
 calm/past_mistakes.py |  3 +++
 calm/reports.py       |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/calm/package.py b/calm/package.py
index c0bdadb..06bfae5 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -1210,15 +1210,15 @@ def validate_package_maintainers(args, packages):
             continue
         if any(['_obsolete' in packages[p].version_hints[vr].get('category', 
'') for vr in packages[p].version_hints]):
             continue
-        # validate that the package's auth_paths are all in the package list
-        for a in packages[p].auth_path:
-            if a not in all_packages:
-                logging.error("package '%s' exists in '%s', which isn't in the 
package list" % (p, a))
-                error = True
         # source which is superseded by a different package, but retained due 
to
         # old install versions can be unmaintained and non-obsolete
         if packages[p].kind == Kind.source:
             continue
+        # validate that at least one of the package's auth_paths is in the 
package list
+        # (XXX: should be the auth_path of the highest version?)
+        if not any(a in all_packages for a in packages[p].auth_path):
+            logging.error("package '%s' exists in '%s', none of which are in 
the package list" % (p, packages[p].auth_path))
+            error = True
         # validate that the source package has a maintainer
         bv = packages[p].best_version
         if bv:
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index b8491b6..f20ed2d 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -190,8 +190,11 @@ nonexistent_provides = historical_provides + [
 
 # ditto, but just for build_requires
 nonexistent_build_requires = [
+    'python-gobject-devel',
     'python2',
     'python27-.*',
+    'python36',
+    'python36-.*'
 ]
 
 # provides which don't exist, and were obsoleted by something else which we've
diff --git a/calm/reports.py b/calm/reports.py
index f47ca68..814b846 100644
--- a/calm/reports.py
+++ b/calm/reports.py
@@ -157,9 +157,9 @@ def maintainer_packages(args, packages, maintainer, 
reportlist):
     body = io.StringIO()
 
     if maintainer:
-        print('<p>Packages maintained by %s.</p>' % maintainer, file=body)
+        print('<p>%d packages maintained by %s.</p>' % (len(um_list), 
maintainer), file=body)
     else:
-        print('<p>Packages without a maintainer.</p>', file=body)
+        print('<p>%d packages without a maintainer.</p>' % (len(um_list)), 
file=body)
 
     print('<table class="grid sortable">', file=body)
     print('<tr><th>last 
updated</th><th>package</th><th>version</th><th>upstream 
version</th><th>status</th><th>rdepends</th><th>build_rdepends</th><th>importance</th></tr>',
 file=body)