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

[Jon Turney via Cygwin-apps-cvs]

Diff:
---
 calm/calm.py    |  5 +++++
 calm/reports.py | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/calm/calm.py b/calm/calm.py
index c039b8e..4ca34ed 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -645,6 +645,11 @@ def do_output(args, state):
                         keys = ' '.join(['-u' + k for k in args.keys])
                         utils.system('/usr/bin/gpg ' + keys + ' --batch --yes 
-b ' + extfile)
 
+    # update a marker file indicating when repository was updated
+    # (for the benefit of quickly checking of mirrors are up to date)
+    if update_json:
+        utils.touch(os.path.join(args.rel_area, '.last-updated'))
+
     # add information from repology to packages
     repology.annotate_packages(args, state.packages)
 
diff --git a/calm/reports.py b/calm/reports.py
index 19eade9..467bff7 100644
--- a/calm/reports.py
+++ b/calm/reports.py
@@ -526,6 +526,7 @@ def python_rebuild(args, packages, fn, reportlist):
             pr.spn = po.srcpackage(bv)
             pr.spo = packages[pr.spn]
             pr.depends = d
+            pr.depends_ver = int(d[6:])
             pr.bv = bv
 
             pr_list.append(pr)
@@ -548,6 +549,7 @@ def python_rebuild(args, packages, fn, reportlist):
         pr.spn = pr.po.srcpackage(pr.po.best_version)
         pr.spo = packages[pr.spn]
         pr.depends = 'python' + str(highest_ver)
+        pr.depends_ver = highest_ver
         pr.bv = pr.po.best_version
 
         pr_list.append(pr)
@@ -556,11 +558,11 @@ def python_rebuild(args, packages, fn, reportlist):
     print('<p>Packages for python module or binding for, or linkage to, a 
python version other than %s.</p>' % latest_py, file=body)
 
     print('<table class="grid sortable">', file=body)
-    
print('<tr><th>package</th><th>srcpackage</th><th>version</th><th>depends</th></tr>',
 file=body)
+    print('<tr><th>package</th><th>srcpackage</th><th>version</th><th 
sorttable_columntype="numeric">depends</th></tr>', file=body)
 
-    for pr in sorted(pr_list, key=lambda i: (i.depends, i.pn)):
-        print('<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>' %
-              (linkify(pr.pn, pr.po), linkify(pr.spn, pr.spo), pr.bv, 
pr.depends), file=body)
+    for pr in sorted(pr_list, key=lambda i: (i.depends_ver, i.pn)):
+        print('<tr><td>%s</td><td>%s</td><td>%s</td><td 
sorttable_customkey="%s">%s</td></tr>' %
+              (linkify(pr.pn, pr.po), linkify(pr.spn, pr.spo), pr.bv, 
pr.depends_ver, pr.depends), file=body)
 
     print('</table>', file=body)