[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-28-g9658ffb

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-28-g9658ffb

[Jon Turney]

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

commit 9658ffbf216528b5a2b306e9204b531942409c9a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri May 5 14:24:28 2023 +0100

    Avoid spurious license normalization warnings over whitespace

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

commit 97ed5181c3f06e4241ad8c160e0e19b951209318
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri May 5 14:19:16 2023 +0100

    Fix page title for rebuild reports


Diff:
---
 calm/hint.py    | 4 ++++
 calm/reports.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/calm/hint.py b/calm/hint.py
index 71fa7b9..c202f8c 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -297,6 +297,10 @@ def hint_file_parse(fn, kind, strict=False):
 
                     # license must be a valid spdx license expression
                     if key == 'license' and licensing:
+                        # first, normalize whitespace in license, so we don't
+                        # get spurious normalization warnings over whitespace
+                        value = re.sub(r'\s+', ' ', value)
+
                         try:
                             licensing.parse(value, strict=True)
                             le = licensing.validate(value, strict=True)
diff --git a/calm/reports.py b/calm/reports.py
index f659cf5..a9a3f4b 100644
--- a/calm/reports.py
+++ b/calm/reports.py
@@ -247,7 +247,7 @@ def provides_rebuild(args, packages, reportfile, provide_package):
     print('</table>', file=body)
 
     with utils.open_amifc(reportfile) as f:
-        template('Packages needing rebuilds for latest perl', body.getvalue(), f)
+        template('Packages needing rebuilds for latest %s' % provide_package, body.getvalue(), f)
 
 
 #