From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 0365B3951402; Mon, 3 May 2021 13:53:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0365B3951402 To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20210408-4-g80021e4 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 09f0fc330c5603d73d180091607d500742f418c3 X-Git-Newrev: 80021e462e5f247fcc5f0de247e5a827eb38dee5 Message-Id: <20210503135353.0365B3951402@sourceware.org> Date: Mon, 3 May 2021 13:53:52 +0000 (GMT) From: Jon TURNEY X-BeenThere: cygwin-apps-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin-apps git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2021 13:53:53 -0000 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=80021e462e5f247fcc5f0de247e5a827eb38dee5 commit 80021e462e5f247fcc5f0de247e5a827eb38dee5 Author: Jon Turney Date: Mon May 3 13:23:29 2021 +0100 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). https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=82933c3ce30e75f1d34f1e970b07362ef6ac700d commit 82933c3ce30e75f1d34f1e970b07362ef6ac700d Author: Jon Turney Date: Mon May 3 13:21:28 2021 +0100 Allow 'virtual' category Allow 'virtual' category, intended for packages which only exist to pull in other packages (i.e. are empty, but have dependencies) Also tidy up category list removing now unused 'mingw' and '_postinstalllast' categories. Diff: --- calm/hint.py | 4 ++-- calm/package.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/calm/hint.py b/calm/hint.py index 5b4935b..2c31714 100755 --- a/calm/hint.py +++ b/calm/hint.py @@ -101,7 +101,6 @@ categories = ['accessibility', 'mail', 'mate', 'math', - 'mingw', 'net', 'ocaml', 'office', @@ -121,11 +120,12 @@ categories = ['accessibility', 'text', 'utils', 'video', + 'virtual', 'web', 'x11', 'xfce', '_obsolete', - '_postinstalllast'] + ] # 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