Ignore a 'cygwin-debuginfo' require: for has_requires purposes

cygport always makes debuginfo packages require that, even if they are
empty.

This currently effects only one package: python3-debuginfo, which is
empty and has no other requires:, so can now be omitted from setup.ini
(which is what we want, as installing it does nothing).

1 files changed, 8 insertions, 3 deletions

diff --git a/calm/package.py b/calm/package.py
index ea41b1f..ba1dec8 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -507,9 +507,6 @@ def validate_packages(args, packages):
                 # if c is in hints, and not the empty string
                 if hints.get(c, ''):
                     for r in hints[c].split(splitchar):
-                        if c == 'requires':
-                            has_requires = True
-
                         # remove any extraneous whitespace
                         r = r.strip()
 
@@ -518,6 +515,14 @@ def validate_packages(args, packages):
                         if splitchar:
                             r = re.sub(r'(.*) +\(.*\)', r'\1', r)
 
+                        if c == 'requires':
+                            # don't count cygwin-debuginfo for the purpose of
+                            # checking if this package has any requires, as
+                            # cygport always makes debuginfo packages require
+                            # that, even if they are empty
+                            if r != 'cygwin-debuginfo':
+                                has_requires = True
+
                         # a package should not appear in it's own hint
                         if r == p:
                             lvl = logging.WARNING if p not in past_mistakes.self_requires else logging.DEBUG