[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20210626-44-g6ef8bde
Jon TURNEY via Cygwin-apps-cvs <[email protected]> Tue, 24 May 2022 14:18:41 +0000 (GMT)
| Newsgroups | gmane.os.cygwin.cvs.apps |
|---|---|
| Message-ID | <[email protected]> |
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=6ef8bdef5f8f9dd76dec89150d0845521fa04b96 commit 6ef8bdef5f8f9dd76dec89150d0845521fa04b96 Author: Jon Turney <[email protected]> Date: Tue May 24 13:38:00 2022 +0100 Warn if source and binary packages diff in test: label This happens due to a bug in cygport 0.35.0, and breaks assumptions made by the deprecated so report (and maybe elsewhere?) Diff: --- calm/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/calm/package.py b/calm/package.py index 45be182..2f318b2 100755 --- a/calm/package.py +++ b/calm/package.py @@ -780,6 +780,14 @@ def validate_packages(args, packages, valid_requires_extra=None): packages[es_p].is_used_by.add(p) missing_source = False + # also check that they match in presence or absence test: label + # + # (this is needed if we are going to compare best_version + # between install and source packages for some information, + # as we do in some places...) + if ('test' in packages[p].version_hints[v]) != ('test' in packages[es_p].version_hints[v]): + logging.error("package '%s' version '%s' test: label mismatches source package '%s'" % (p, v, es_p)) + if missing_source: # unless the install tarfile is empty if packages[p].tar(v).is_empty: