[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20200401-29-g5b661ae
Jon TURNEY via Cygwin-apps-cvs <[email protected]>
| Newsgroups | gmane.os.cygwin.cvs.apps |
|---|---|
| Message-ID | <[email protected]> |
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=5b661aed3b4de60dd6460439867e3db8041b470e commit 5b661aed3b4de60dd6460439867e3db8041b470e Author: Jon Turney <[email protected]> Date: Mon May 25 20:33:34 2020 +0100 Make override.hint only uploads work If an upload just add an override.hint, there's still something to do, even if it doesn't add any packages. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=d863c1a2070264d5a156b424073b22c9f322b4fd commit d863c1a2070264d5a156b424073b22c9f322b4fd Author: Jon Turney <[email protected]> Date: Sun Apr 12 19:18:56 2020 +0100 Remove support for curr: appearing in override.hint This doesn't really work the way it's expected to across setup versions, and isn't a good way of approaching the problem (current alternatives: make the version you want to be preferred have the highest non-test version, or use replace-versions: to cause higher versions to be uninstalled). Future work: lots of cruft for handling stability level overrides remains, which can all be cleaned up. Diff: --- calm/calm.py | 6 +++--- calm/hint.py | 1 - .../hints/x86/release/cygwin/cygwin-debuginfo/override.expected | 2 +- .../hints/x86/release/cygwin/cygwin-devel/override.expected | 2 +- test/testdata/hints/x86/release/cygwin/override.expected | 2 +- test/testdata/hints/x86/release/per-version/override.expected | 2 +- test/testdata/hints/x86/release/staleversion/override.expected | 2 +- .../hints/x86/release/staleversion/staleversion-251-0-src.expected | 3 ++- .../hints/x86/release/staleversion/staleversion-251-0.expected | 3 ++- .../homes/Blooey McFooey/x86/release/per-version/override.hint | 1 - test/testdata/htdocs.expected/summary/staleversion-src.html | 2 +- test/testdata/htdocs.expected/summary/staleversion.html | 2 +- test/testdata/inifile/setup.ini.expected | 2 +- test/testdata/process_arch/packages.json.expected | 4 ++-- .../relarea/x86/release/cygwin/cygwin-debuginfo/override.hint | 1 - test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint | 1 - test/testdata/relarea/x86/release/cygwin/override.hint | 1 - test/testdata/relarea/x86/release/per-version/override.hint | 1 - test/testdata/relarea/x86/release/staleversion/override.hint | 2 +- .../relarea/x86/release/staleversion/staleversion-251-0-src.hint | 1 + .../relarea/x86/release/staleversion/staleversion-251-0.hint | 1 + 21 files changed, 20 insertions(+), 22 deletions(-) diff --git a/calm/calm.py b/calm/calm.py index 3fb0e62..dc5df16 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -163,9 +163,9 @@ def process_uploads(args, state): # queue for source package validator queue.add(args, scan_result[arch].to_relarea, os.path.join(m.homedir())) - # if there are no uploaded or removed packages for this - # maintainer, we don't have anything to do - if not any([scan_result[a].packages or scan_result[a].to_vault for a in scan_result]): + # if there are no added or removed files for this maintainer, we + # don't have anything to do + if not any([scan_result[a].to_relarea or scan_result[a].to_vault for a in scan_result]): logging.debug("nothing to do for maintainer %s" % (name)) skip_maintainer = True diff --git a/calm/hint.py b/calm/hint.py index 7ba0a51..1256d44 100755 --- a/calm/hint.py +++ b/calm/hint.py @@ -70,7 +70,6 @@ hintkeys[spvr].update({ }) hintkeys[override] = { - 'curr': 'val', 'keep': 'val', 'keep-count': 'val', 'keep-count-test': 'val', diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/override.expected b/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/override.expected index dfdb247..d544941 100644 --- a/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/override.expected +++ b/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/override.expected @@ -1 +1 @@ -OrderedDict([('keep', '2.2.0-1'), ('curr', '2.2.1-1')]) +OrderedDict([('keep', '2.2.0-1')]) diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-devel/override.expected b/test/testdata/hints/x86/release/cygwin/cygwin-devel/override.expected index dfdb247..d544941 100644 --- a/test/testdata/hints/x86/release/cygwin/cygwin-devel/override.expected +++ b/test/testdata/hints/x86/release/cygwin/cygwin-devel/override.expected @@ -1 +1 @@ -OrderedDict([('keep', '2.2.0-1'), ('curr', '2.2.1-1')]) +OrderedDict([('keep', '2.2.0-1')]) diff --git a/test/testdata/hints/x86/release/cygwin/override.expected b/test/testdata/hints/x86/release/cygwin/override.expected index dfdb247..d544941 100644 --- a/test/testdata/hints/x86/release/cygwin/override.expected +++ b/test/testdata/hints/x86/release/cygwin/override.expected @@ -1 +1 @@ -OrderedDict([('keep', '2.2.0-1'), ('curr', '2.2.1-1')]) +OrderedDict([('keep', '2.2.0-1')]) diff --git a/test/testdata/hints/x86/release/per-version/override.expected b/test/testdata/hints/x86/release/per-version/override.expected index 73d138e..75890e5 100644 --- a/test/testdata/hints/x86/release/per-version/override.expected +++ b/test/testdata/hints/x86/release/per-version/override.expected @@ -1 +1 @@ -OrderedDict([('curr', '4.8-1')]) +OrderedDict() diff --git a/test/testdata/hints/x86/release/staleversion/override.expected b/test/testdata/hints/x86/release/staleversion/override.expected index a05ab32..4506cc2 100644 --- a/test/testdata/hints/x86/release/staleversion/override.expected +++ b/test/testdata/hints/x86/release/staleversion/override.expected @@ -1 +1 @@ -OrderedDict([('curr', '250-0'), ('keep', '243-0'), ('keep-count', '0')]) +OrderedDict([('keep', '243-0'), ('keep-count', '0'), ('keep-count-test', '1')]) diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected b/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected index f7cc4fd..a876af9 100644 --- a/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected +++ b/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected @@ -1,4 +1,5 @@ {'sdesc': '"Test package for stale version removal"', 'ldesc': '"Test package for stale version removal"', 'category': 'Shells Base', - 'requires': ''} + 'requires': '', + 'test': ''} diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-251-0.expected b/test/testdata/hints/x86/release/staleversion/staleversion-251-0.expected index f7cc4fd..a876af9 100644 --- a/test/testdata/hints/x86/release/staleversion/staleversion-251-0.expected +++ b/test/testdata/hints/x86/release/staleversion/staleversion-251-0.expected @@ -1,4 +1,5 @@ {'sdesc': '"Test package for stale version removal"', 'ldesc': '"Test package for stale version removal"', 'category': 'Shells Base', - 'requires': ''} + 'requires': '', + 'test': ''} diff --git a/test/testdata/homes/Blooey McFooey/x86/release/per-version/override.hint b/test/testdata/homes/Blooey McFooey/x86/release/per-version/override.hint index a20e3c0..e69de29 100644 --- a/test/testdata/homes/Blooey McFooey/x86/release/per-version/override.hint +++ b/test/testdata/homes/Blooey McFooey/x86/release/per-version/override.hint @@ -1 +0,0 @@ -curr: 4.8-1 diff --git a/test/testdata/htdocs.expected/summary/staleversion-src.html b/test/testdata/htdocs.expected/summary/staleversion-src.html index 9f1006d..ad75a13 100755 --- a/test/testdata/htdocs.expected/summary/staleversion-src.html +++ b/test/testdata/htdocs.expected/summary/staleversion-src.html @@ -26,7 +26,7 @@ <tr><td>242-0 (source)</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion-src/staleversion-242-0-src">list of files</a>]</td><td>stable</td></tr> <tr><td>243-0 (source)</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion-src/staleversion-243-0-src">list of files</a>]</td><td>stable</td></tr> <tr><td>250-0 (source)</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion-src/staleversion-250-0-src">list of files</a>]</td><td>stable</td></tr> -<tr><td>251-0 (source)</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion-src/staleversion-251-0-src">list of files</a>]</td><td>stable</td></tr> +<tr><td>251-0 (source)</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion-src/staleversion-251-0-src">list of files</a>]</td><td>test</td></tr> <tr><td>260-0 (source)</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion-src/staleversion-260-0-src">list of files</a>]</td><td>test</td></tr> </table><br> </ul> diff --git a/test/testdata/htdocs.expected/summary/staleversion.html b/test/testdata/htdocs.expected/summary/staleversion.html index e75eb27..fd75694 100644 --- a/test/testdata/htdocs.expected/summary/staleversion.html +++ b/test/testdata/htdocs.expected/summary/staleversion.html @@ -26,7 +26,7 @@ <tr><td>242-0</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion/staleversion-242-0">list of files</a>]</td><td>stable</td></tr> <tr><td>243-0</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion/staleversion-243-0">list of files</a>]</td><td>stable</td></tr> <tr><td>250-0</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion/staleversion-250-0">list of files</a>]</td><td>stable</td></tr> -<tr><td>251-0</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion/staleversion-251-0">list of files</a>]</td><td>stable</td></tr> +<tr><td>251-0</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion/staleversion-251-0">list of files</a>]</td><td>test</td></tr> <tr><td>260-0</td><td class="right">1 kB</td><td>[<a href="../x86/staleversion/staleversion-260-0">list of files</a>]</td><td>test</td></tr> </table><br> </ul> diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected index f5b6501..38faf90 100644 --- a/test/testdata/inifile/setup.ini.expected +++ b/test/testdata/inifile/setup.ini.expected @@ -303,7 +303,7 @@ 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' 'source: x86/release/staleversion/staleversion-250-0-src.tar.xz 228 ' 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' - '[prev]\n' + '[test]\n' 'version: 251-0\n' 'install: x86/release/staleversion/staleversion-251-0.tar.xz 228 ' 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' diff --git a/test/testdata/process_arch/packages.json.expected b/test/testdata/process_arch/packages.json.expected index d5c0a9b..f639e3c 100644 --- a/test/testdata/process_arch/packages.json.expected +++ b/test/testdata/process_arch/packages.json.expected @@ -333,10 +333,10 @@ ' "240-1",\n' ' "242-0",\n' ' "243-0",\n' - ' "250-0",\n' - ' "251-0"\n' + ' "250-0"\n' ' ],\n' ' "test": [\n' + ' "251-0",\n' ' "260-0"\n' ' ]\n' ' }\n' diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint index 8688790..ff21008 100644 --- a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint +++ b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint @@ -1,2 +1 @@ keep: 2.2.0-1 -curr: 2.2.1-1 diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint index 8688790..ff21008 100644 --- a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint +++ b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint @@ -1,2 +1 @@ keep: 2.2.0-1 -curr: 2.2.1-1 diff --git a/test/testdata/relarea/x86/release/cygwin/override.hint b/test/testdata/relarea/x86/release/cygwin/override.hint index 8688790..ff21008 100644 --- a/test/testdata/relarea/x86/release/cygwin/override.hint +++ b/test/testdata/relarea/x86/release/cygwin/override.hint @@ -1,2 +1 @@ keep: 2.2.0-1 -curr: 2.2.1-1 diff --git a/test/testdata/relarea/x86/release/per-version/override.hint b/test/testdata/relarea/x86/release/per-version/override.hint index 05c784e..8b13789 100644 --- a/test/testdata/relarea/x86/release/per-version/override.hint +++ b/test/testdata/relarea/x86/release/per-version/override.hint @@ -1,2 +1 @@ -curr: 4.8-1 diff --git a/test/testdata/relarea/x86/release/staleversion/override.hint b/test/testdata/relarea/x86/release/staleversion/override.hint index 03d9a7e..e127171 100644 --- a/test/testdata/relarea/x86/release/staleversion/override.hint +++ b/test/testdata/relarea/x86/release/staleversion/override.hint @@ -1,3 +1,3 @@ -curr: 250-0 keep: 243-0 keep-count: 0 +keep-count-test: 1 diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint index 7f7f48a..5d7b35e 100644 --- a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint +++ b/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint @@ -2,3 +2,4 @@ sdesc: "Test package for stale version removal" ldesc: "Test package for stale version removal" category: Shells Base requires: +test: diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-251-0.hint index 7f7f48a..5d7b35e 100644 --- a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0.hint +++ b/test/testdata/relarea/x86/release/staleversion/staleversion-251-0.hint @@ -2,3 +2,4 @@ sdesc: "Test package for stale version removal" ldesc: "Test package for stale version removal" category: Shells Base requires: +test: