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

[Jon Turney via Cygwin-apps-cvs]

Diff:
---
 calm/untest.py                                     | 2 +-
 test/test_calm.py                                  | 1 +
 test/testdata/gitolite/package-repos.conf.expected | 2 +-
 test/testdata/htdocs.expected/summary/rpm-doc.html | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/calm/untest.py b/calm/untest.py
index 7744108..49c4e5f 100644
--- a/calm/untest.py
+++ b/calm/untest.py
@@ -45,7 +45,7 @@ def untest(pvr):
     for arch in common_constants.ARCHES + ['noarch']:
         for (dirpath, _subdirs, files) in 
os.walk(os.path.join(common_constants.FTP, arch, 'release', p)):
             for f in files:
-                if re.match(r'.*-' + re.escape(vr) + '(|-src).hint$', f):
+                if re.match(r'.*-' + re.escape(vr) + r'.*\.hint$', f):
                     total = total + 1
                     fn = os.path.join(dirpath, f)
 
diff --git a/test/test_calm.py b/test/test_calm.py
index a61a644..a3e06c6 100755
--- a/test/test_calm.py
+++ b/test/test_calm.py
@@ -548,6 +548,7 @@ class CalmTest(unittest.TestCase):
                    (os.path.join(relarea_arch, 'per-version', 
'per-version-4.0-1-src.tar.xz'), '2017-04-09'),
                    (os.path.join(relarea_arch, 'rpm-doc', 
'rpm-doc-4.1-2.tar.bz2'), '2016-11-02'),
                    (os.path.join(relarea_arch, 'rpm-doc', 
'rpm-doc-4.1-2-src.tar.bz2'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'rpm-doc', 
'rpm-doc-999-1.tar.bz2'), '2019-03-02'),
                    (os.path.join(relarea_arch, 'staleversion', 
'staleversion-240-1.tar.xz'), '2017-04-07'),
                    (os.path.join(relarea_arch, 'staleversion', 
'staleversion-240-1-src.tar.xz'), '2017-04-07'),
                    (os.path.join(relarea_arch, 'staleversion', 
'staleversion-242-0.tar.xz'), '2017-04-08'),
diff --git a/test/testdata/gitolite/package-repos.conf.expected 
b/test/testdata/gitolite/package-repos.conf.expected
index 0af3049..a573afa 100644
--- a/test/testdata/gitolite/package-repos.conf.expected
+++ b/test/testdata/gitolite/package-repos.conf.expected
@@ -1,6 +1,6 @@
 ('# automatically generated by mkgitoliteconf\n'
  '\n'
- '@leads = Achim_Gratz Corinna_Vinschen Brian_Inglis Jon_Turney Ken_Brown 
Marco_Atzeri\n'
+ '@leads = Achim_Gratz Brian_Inglis Corinna_Vinschen Jon_Turney Ken_Brown 
Marco_Atzeri Takashi_Yano\n'
  '\n'
  'repo @allpackages\n'
  '    RW = @leads\n'
diff --git a/test/testdata/htdocs.expected/summary/rpm-doc.html 
b/test/testdata/htdocs.expected/summary/rpm-doc.html
index 85dd47b..7a02078 100644
--- a/test/testdata/htdocs.expected/summary/rpm-doc.html
+++ b/test/testdata/htdocs.expected/summary/rpm-doc.html
@@ -19,7 +19,7 @@
 <table class="pkgtable">
 <tr><th>Version</th><th>Arch</th><th>Package 
Size</th><th>Date</th><th>Files</th><th>Status</th></tr>
 <tr><td>4.1-2</td><td>x86_64</td><td class="right">50 KiB</td><td>2016-11-02 
00:00</td><td>[<a href="../x86_64/rpm-doc/rpm-doc-4.1-2">list of 
files</a>]</td><td>stable</td></tr>
-<tr><td>999-1</td><td>x86_64</td><td class="right">1 KiB</td><td>2018-03-02 
00:00</td><td>[<a href="../x86_64/rpm-doc/rpm-doc-999-1">list of 
files</a>]</td><td>stable</td></tr>
+<tr><td>999-1</td><td>x86_64</td><td class="right">1 KiB</td><td>2019-03-02 
00:00</td><td>[<a href="../x86_64/rpm-doc/rpm-doc-999-1">list of 
files</a>]</td><td>stable</td></tr>
 </table><br>
 </div>
 </body>