diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2022-09-01 23:02:20 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2022-10-02 14:57:17 +0300 |
| commit | 4d95cbff712f07bf70115b75a8bb0b3d0f5face3 (patch) | |
| tree | aedc5f28a9e06ffae73572ac5915f33d3eab88ee | |
| parent | c7f80012646d51f3120f53e208ed1c78734dc5ac (diff) | |
Allow '_windows' pseudo-package to appear in requires:
Also add a test for that.
| -rw-r--r-- | calm/past_mistakes.py | 1 | ||||
| -rw-r--r-- | test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3.expected | 2 | ||||
| -rw-r--r-- | test/testdata/inifile/setup.ini.expected | 2 | ||||
| -rw-r--r-- | test/testdata/process_arch/setup.ini.expected | 2 | ||||
| -rw-r--r-- | test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.hint | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py index e4135aa..1403840 100644 --- a/calm/past_mistakes.py +++ b/calm/past_mistakes.py @@ -194,6 +194,7 @@ missing_obsolete = { # provides: which don't exist nonexistent_provides = [ + '_windows', 'perl5_026', 'rdiff-debuginfo', # not in x86 'rxvt-unicode-X-debuginfo', # not in x86_64 diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3.expected b/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3.expected index 4c2d9d7..7d9ea86 100644 --- a/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3.expected +++ b/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3.expected @@ -1,7 +1,7 @@ {'sdesc': '"The UNIX emulation engine"', 'ldesc': '"The UNIX emulation engine"', 'category': 'Base', - 'requires': 'base-cygwin', + 'requires': 'base-cygwin _windows ( >= 6.0 )', 'provides': 'cygwin-api0_291', 'conflicts': 'fruit-juice', 'test': ''} diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected index 7c19723..aaf6805 100644 --- a/test/testdata/inifile/setup.ini.expected +++ b/test/testdata/inifile/setup.ini.expected @@ -73,7 +73,7 @@ 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' 'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 ' 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' - 'depends2: base-cygwin\n' + 'depends2: _windows ( >= 6.0 ), base-cygwin\n' 'provides: cygwin-api0_291\n' 'conflicts: fruit-juice\n' '\n' diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected index c83b566..288ff40 100644 --- a/test/testdata/process_arch/setup.ini.expected +++ b/test/testdata/process_arch/setup.ini.expected @@ -73,7 +73,7 @@ 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' 'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 ' 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' - 'depends2: base-cygwin\n' + 'depends2: _windows ( >= 6.0 ), base-cygwin\n' 'provides: cygwin-api0_291\n' 'conflicts: fruit-juice\n' '\n' diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.hint index 9e3e36e..842197e 100644 --- a/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.hint +++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.hint @@ -1,7 +1,7 @@ sdesc: "The UNIX emulation engine" ldesc: "The UNIX emulation engine" category: Base -requires: base-cygwin +requires: base-cygwin _windows ( >= 6.0 ) provides: cygwin-api0_291 conflicts: fruit-juice test: |