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

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

[Jon Turney]

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

commit 31f6e2b47099f87248355fb6ff8bcfa420bbc909
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Apr 7 11:34:17 2023 +0100

    Check that build-requires: lists valid package names, as well
    
    Fix test data to satisfy that.


Diff:
---
 calm/mksetupini.py                                                  | 2 +-
 calm/package.py                                                     | 3 ++-
 test/testdata/hints/noarch/release/test-e/test-e-1.0-1-src.expected | 2 +-
 test/testdata/htdocs.expected/summary/test-e-src.html               | 2 +-
 test/testdata/inifile/setup.ini.expected                            | 2 +-
 test/testdata/process_arch/setup.ini.expected                       | 2 +-
 test/testdata/relarea/noarch/release/test-e/test-e-1.0-1-src.hint   | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/calm/mksetupini.py b/calm/mksetupini.py
index 41e7535..b4849b5 100755
--- a/calm/mksetupini.py
+++ b/calm/mksetupini.py
@@ -132,7 +132,7 @@ def main():
     pkglist_default = common_constants.PKGMAINT
     relarea_default = common_constants.FTP
 
-    disable_check_choices = choiceList(['missing-curr', 'missing-depended-package', 'missing-obsoleted-package', 'missing-required-package', 'curr-most-recent'])
+    disable_check_choices = choiceList(['missing-curr', 'missing-depended-package', 'missing-obsoleted-package', 'missing-required-package', 'curr-most-recent', 'missing-build-depended-package'])
 
     parser = argparse.ArgumentParser(description='Make setup.ini')
     parser.add_argument('--arch', action='store', required=True, choices=common_constants.ARCHES + common_constants.ARCHIVED_ARCHES)
diff --git a/calm/package.py b/calm/package.py
index 21639cb..9bcaf04 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -701,7 +701,8 @@ def validate_packages(args, packages, valid_provides_extra=None, missing_obsolet
         for (v, hints) in packages[p].version_hints.items():
             for (c, okmissing, valid) in [
                     ('depends', 'missing-depended-package', valid_requires),
-                    ('obsoletes', 'missing-obsoleted-package', valid_obsoletes)
+                    ('obsoletes', 'missing-obsoleted-package', valid_obsoletes),
+                    ('build-depends', 'missing-build-depended-package', valid_requires),
             ]:
                 # if c is in hints, and not the empty string
                 if hints.get(c, ''):
diff --git a/test/testdata/hints/noarch/release/test-e/test-e-1.0-1-src.expected b/test/testdata/hints/noarch/release/test-e/test-e-1.0-1-src.expected
index e7414e7..f77c78a 100644
--- a/test/testdata/hints/noarch/release/test-e/test-e-1.0-1-src.expected
+++ b/test/testdata/hints/noarch/release/test-e/test-e-1.0-1-src.expected
@@ -1 +1 @@
-OrderedDict([('category', 'Devel'), ('sdesc', '"test package E"'), ('build-depends', 'libtextcat-devel')])
+OrderedDict([('category', 'Devel'), ('sdesc', '"test package E"'), ('build-depends', 'cygwin-devel')])
diff --git a/test/testdata/htdocs.expected/summary/test-e-src.html b/test/testdata/htdocs.expected/summary/test-e-src.html
index a1358ab..565206e 100755
--- a/test/testdata/htdocs.expected/summary/test-e-src.html
+++ b/test/testdata/htdocs.expected/summary/test-e-src.html
@@ -13,7 +13,7 @@
 <span class="detail">summary</span>: test package E<br><br>
 <span class="detail">description</span>: test package E<br><br>
 <span class="detail">categories</span>: Devel<br><br>
-<span class="detail">build-depends</span>: libtextcat-devel<br><br>
+<span class="detail">build-depends</span>: <a href="cygwin-devel.html">cygwin-devel</a><br><br>
 <span class="detail">install package(s)</span>: <a href="test-e.html">test-e</a><br><br>
 <span class="detail">maintainer(s)</span>: ORPHANED 
 <span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected
index 4e6b989..9d24a72 100644
--- a/test/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
@@ -356,7 +356,7 @@
  '2e47817b620a7dbfe6810d47aee0adbcdf4663dc57932bcc51fc4b9bcfafa00dbbc2bfbefb1692dd5f6cc5333f23aea324d7c4d9b2ca091b917811fcdb70ca1f\n'
  'source: noarch/release/test-e/test-e-1.0-1-src.tar.xz 236 '
  '2e47817b620a7dbfe6810d47aee0adbcdf4663dc57932bcc51fc4b9bcfafa00dbbc2bfbefb1692dd5f6cc5333f23aea324d7c4d9b2ca091b917811fcdb70ca1f\n'
- 'build-depends: libtextcat-devel\n'
+ 'build-depends: cygwin-devel\n'
  '\n'
  '@ testpackage\n'
  'sdesc: "A test package (stuff & other stuff)"\n'
diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index 93446da..eace177 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -345,7 +345,7 @@
  '2e47817b620a7dbfe6810d47aee0adbcdf4663dc57932bcc51fc4b9bcfafa00dbbc2bfbefb1692dd5f6cc5333f23aea324d7c4d9b2ca091b917811fcdb70ca1f\n'
  'source: noarch/release/test-e/test-e-1.0-1-src.tar.xz 236 '
  '2e47817b620a7dbfe6810d47aee0adbcdf4663dc57932bcc51fc4b9bcfafa00dbbc2bfbefb1692dd5f6cc5333f23aea324d7c4d9b2ca091b917811fcdb70ca1f\n'
- 'build-depends: libtextcat-devel\n'
+ 'build-depends: cygwin-devel\n'
  '\n'
  '@ testpackage\n'
  'sdesc: "A test package"\n'
diff --git a/test/testdata/relarea/noarch/release/test-e/test-e-1.0-1-src.hint b/test/testdata/relarea/noarch/release/test-e/test-e-1.0-1-src.hint
index d151b15..3c4cc18 100755
--- a/test/testdata/relarea/noarch/release/test-e/test-e-1.0-1-src.hint
+++ b/test/testdata/relarea/noarch/release/test-e/test-e-1.0-1-src.hint
@@ -1,3 +1,3 @@
 category: Devel
 sdesc: "test package E"
-build-depends: libtextcat-devel
+build-depends: cygwin-devel