diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2022-09-01 19:59:02 +0300 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2022-10-02 14:57:16 +0300 |
commit | c7f80012646d51f3120f53e208ed1c78734dc5ac (patch) | |
tree | 99e327c891bdc61e415b437568ca44acf53744ef /test | |
parent | 8e2b79710039094bf941beb4270013895cf5dd6c (diff) |
Handle a version-constraint appearing in requires:
Synthesize depends: from requires: in a way which doesn't mess up any
version-constraint present while sorting.
Future work:
Store the depends: hint decomposed into a list, rather than a string
which needs to get split everywhere it's used.
Diffstat (limited to 'test')
6 files changed, 6 insertions, 6 deletions
diff --git a/test/testdata/hints/noarch/release/test-c/test-c-1.0-1.expected b/test/testdata/hints/noarch/release/test-c/test-c-1.0-1.expected index ab6b117..d5a43b4 100644 --- a/test/testdata/hints/noarch/release/test-c/test-c-1.0-1.expected +++ b/test/testdata/hints/noarch/release/test-c/test-c-1.0-1.expected @@ -1,4 +1,4 @@ {'category': 'Devel', 'sdesc': '"test package C"', 'obsoletes': 'obs-a, obs-b', - 'requires': 'test-d test-e'} + 'requires': 'test-d (>= 1.0), test-e'} diff --git a/test/testdata/hints/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.expected b/test/testdata/hints/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.expected index aca0db6..f60d34d 100644 --- a/test/testdata/hints/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.expected +++ b/test/testdata/hints/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.expected @@ -7,6 +7,6 @@ 'BSD License.\n' 'http://software.wise-guys.nl/libtextcat/"', 'category': 'Devel Text', - 'requires': 'libtextcat libtextcat0', + 'requires': 'libtextcat0 libtextcat', 'external-source': 'libtextcat', 'parse-errors': ['embedded quote at line 7']} diff --git a/test/testdata/htdocs.expected/summary/test-c.html b/test/testdata/htdocs.expected/summary/test-c.html index 63c827a..200bd7b 100644 --- a/test/testdata/htdocs.expected/summary/test-c.html +++ b/test/testdata/htdocs.expected/summary/test-c.html @@ -13,7 +13,7 @@ <span class="detail">summary</span>: test package C<br><br> <span class="detail">description</span>: test package C<br><br> <span class="detail">categories</span>: Devel<br><br> -<span class="detail">depends</span>: <a href="test-d.html">test-d</a>, <a href="test-e.html">test-e</a><br><br> +<span class="detail">depends</span>: <a href="test-d.html">test-d (>= 1.0)</a>, <a href="test-e.html">test-e</a><br><br> <span class="detail">obsoletes</span>: <a href="obs-a.html">obs-a</a>, <a href="obs-b.html">obs-b</a><br><br> <span class="detail">source package</span>: <a href="test-c-src.html">test-c</a><br><br> <span class="detail">maintainer(s)</span>: ORPHANED diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected index 19a18a0..7c19723 100644 --- a/test/testdata/inifile/setup.ini.expected +++ b/test/testdata/inifile/setup.ini.expected @@ -336,7 +336,7 @@ 'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n' 'source: noarch/release/test-c/test-c-1.0-1-src.tar.xz 256 ' 'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n' - 'depends2: test-d, test-e\n' + 'depends2: test-d (>= 1.0), test-e\n' 'obsoletes: obs-a, obs-b\n' '\n' '@ test-d\n' diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected index c2d2cfc..c83b566 100644 --- a/test/testdata/process_arch/setup.ini.expected +++ b/test/testdata/process_arch/setup.ini.expected @@ -325,7 +325,7 @@ 'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n' 'source: noarch/release/test-c/test-c-1.0-1-src.tar.xz 256 ' 'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n' - 'depends2: test-d, test-e\n' + 'depends2: test-d (>= 1.0), test-e\n' 'obsoletes: obs-a, obs-b\n' '\n' '@ test-d\n' diff --git a/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1.hint b/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1.hint index af5eb4b..5ab7f54 100755 --- a/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1.hint +++ b/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1.hint @@ -1,4 +1,4 @@ category: Devel sdesc: "test package C" obsoletes: obs-a obs-b -requires: test-d test-e +requires: test-d (>= 1.0), test-e |