public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
From: jturney@sourceware.org
To: cygwin-apps-cvs@sourceware.org
Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20200220-3-g3cc0899
Date: Mon, 24 Feb 2020 13:31:00 -0000 [thread overview]
Message-ID: <20200224133107.87059.qmail@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=3cc08991e70dc07e5e64cb4295b4328f991159b0
commit 3cc08991e70dc07e5e64cb4295b4328f991159b0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Feb 22 18:14:44 2020 +0000
Remove support for prev: appearing in override.hint
setup hasn't supported specifically installing the prev: version since
2011 (setup version 2.761) (See [1])
prev: is equivalent to keep:
[1] https://cygwin.com/ml/cygwin-apps/2011-07/msg00064.html
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=27852b2451627b1711efa4d7b82d563e21f133e5
commit 27852b2451627b1711efa4d7b82d563e21f133e5
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Feb 21 15:03:11 2020 +0000
Remove support for test: appearing in override.hint
Everyone should now be using a test: key in the pvr.hint instead.
There's some internal de-crufication which can follow.
Diff:
---
calm/hint.py | 2 --
test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3.expected | 3 ++-
.../cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected | 3 ++-
.../hints/x86/release/cygwin/cygwin-debuginfo/override.expected | 2 +-
.../x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected | 3 ++-
test/testdata/hints/x86/release/cygwin/cygwin-devel/override.expected | 2 +-
test/testdata/hints/x86/release/cygwin/override.expected | 2 +-
test/testdata/hints/x86/release/staleversion/override.expected | 2 +-
.../hints/x86/release/staleversion/staleversion-260-0.expected | 3 ++-
.../homes/Blooey McFooey/x86/release/per-version/override.hint | 1 -
.../Blooey McFooey/x86/release/per-version/per-version-5.0-1.hint | 1 +
test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.hint | 1 +
.../release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint | 1 +
.../testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint | 3 +--
.../x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint | 1 +
test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint | 3 +--
test/testdata/relarea/x86/release/cygwin/override.hint | 3 +--
test/testdata/relarea/x86/release/staleversion/override.hint | 3 +--
test/testdata/relarea/x86/release/staleversion/staleversion-260-0.hint | 1 +
19 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/calm/hint.py b/calm/hint.py
index ec9bda9..19b16ff 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -62,8 +62,6 @@ hintkeys[pvr] = {
hintkeys[override] = {
'curr': 'val',
- 'prev': 'val',
- 'test': 'val',
'keep': 'val',
'keep-count': 'val',
'keep-count-test': 'val',
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 6658b1e..4c2d9d7 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
@@ -3,4 +3,5 @@
'category': 'Base',
'requires': 'base-cygwin',
'provides': 'cygwin-api0_291',
- 'conflicts': 'fruit-juice'}
+ 'conflicts': 'fruit-juice',
+ 'test': ''}
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected b/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected
index a9b0d70..671d80a 100644
--- a/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected
+++ b/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected
@@ -2,4 +2,5 @@
'requires': 'cygwin-debuginfo',
'external-source': 'cygwin',
'sdesc': '"Debug info for cygwin"',
- 'ldesc': '"This package contains files necessary for debugging the\ncygwin package with gdb."'}
+ 'ldesc': '"This package contains files necessary for debugging the\ncygwin package with gdb."',
+ 'test': ''}
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 5c3039e..dfdb247 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([('prev', '2.2.0-1'), ('curr', '2.2.1-1'), ('test', '2.3.0-0.3')])
+OrderedDict([('keep', '2.2.0-1'), ('curr', '2.2.1-1')])
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected b/test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected
index 7a8bc17..2d83093 100644
--- a/test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected
+++ b/test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected
@@ -2,4 +2,5 @@
'requires': '',
'sdesc': '"Core development files"',
'ldesc': '"Core development files required to build Cygwin packages"',
- 'external-source': 'cygwin'}
+ 'external-source': 'cygwin',
+ 'test': ''}
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 5c3039e..dfdb247 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([('prev', '2.2.0-1'), ('curr', '2.2.1-1'), ('test', '2.3.0-0.3')])
+OrderedDict([('keep', '2.2.0-1'), ('curr', '2.2.1-1')])
diff --git a/test/testdata/hints/x86/release/cygwin/override.expected b/test/testdata/hints/x86/release/cygwin/override.expected
index 5c3039e..dfdb247 100644
--- a/test/testdata/hints/x86/release/cygwin/override.expected
+++ b/test/testdata/hints/x86/release/cygwin/override.expected
@@ -1 +1 @@
-OrderedDict([('prev', '2.2.0-1'), ('curr', '2.2.1-1'), ('test', '2.3.0-0.3')])
+OrderedDict([('keep', '2.2.0-1'), ('curr', '2.2.1-1')])
diff --git a/test/testdata/hints/x86/release/staleversion/override.expected b/test/testdata/hints/x86/release/staleversion/override.expected
index a0e7bdc..a05ab32 100644
--- a/test/testdata/hints/x86/release/staleversion/override.expected
+++ b/test/testdata/hints/x86/release/staleversion/override.expected
@@ -1 +1 @@
-OrderedDict([('test', '260-0'), ('curr', '250-0'), ('prev', '243-0'), ('keep-count', '0')])
+OrderedDict([('curr', '250-0'), ('keep', '243-0'), ('keep-count', '0')])
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-260-0.expected b/test/testdata/hints/x86/release/staleversion/staleversion-260-0.expected
index f7cc4fd..a876af9 100644
--- a/test/testdata/hints/x86/release/staleversion/staleversion-260-0.expected
+++ b/test/testdata/hints/x86/release/staleversion/staleversion-260-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 aeb41e4..a20e3c0 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,2 +1 @@
curr: 4.8-1
-test: 5.0-1
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1.hint b/test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1.hint
index 1f86c0b..95613ce 100644
--- a/test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1.hint
@@ -2,3 +2,4 @@ sdesc: "Per-version hint test package"
ldesc: "Per-version hint test package"
category: Base
requires: base-cygwin
+test:
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 e9c4d59..9e3e36e 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
@@ -4,3 +4,4 @@ category: Base
requires: base-cygwin
provides: cygwin-api0_291
conflicts: fruit-juice
+test:
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint
index 274af74..b497956 100644
--- a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint
@@ -4,3 +4,4 @@ external-source: cygwin
sdesc: "Debug info for cygwin"
ldesc: "This package contains files necessary for debugging the
cygwin package with gdb."
+test:
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 3634a56..8688790 100644
--- a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint
@@ -1,3 +1,2 @@
-prev: 2.2.0-1
+keep: 2.2.0-1
curr: 2.2.1-1
-test: 2.3.0-0.3
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint
index 2713c4d..3964735 100644
--- a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint
@@ -3,3 +3,4 @@ requires:
sdesc: "Core development files"
ldesc: "Core development files required to build Cygwin packages"
external-source: cygwin
+test:
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 3634a56..8688790 100644
--- a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint
@@ -1,3 +1,2 @@
-prev: 2.2.0-1
+keep: 2.2.0-1
curr: 2.2.1-1
-test: 2.3.0-0.3
diff --git a/test/testdata/relarea/x86/release/cygwin/override.hint b/test/testdata/relarea/x86/release/cygwin/override.hint
index 3634a56..8688790 100644
--- a/test/testdata/relarea/x86/release/cygwin/override.hint
+++ b/test/testdata/relarea/x86/release/cygwin/override.hint
@@ -1,3 +1,2 @@
-prev: 2.2.0-1
+keep: 2.2.0-1
curr: 2.2.1-1
-test: 2.3.0-0.3
diff --git a/test/testdata/relarea/x86/release/staleversion/override.hint b/test/testdata/relarea/x86/release/staleversion/override.hint
index d9a9613..03d9a7e 100644
--- a/test/testdata/relarea/x86/release/staleversion/override.hint
+++ b/test/testdata/relarea/x86/release/staleversion/override.hint
@@ -1,4 +1,3 @@
-test: 260-0
curr: 250-0
-prev: 243-0
+keep: 243-0
keep-count: 0
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-260-0.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-260-0.hint
index 7f7f48a..5d7b35e 100644
--- a/test/testdata/relarea/x86/release/staleversion/staleversion-260-0.hint
+++ b/test/testdata/relarea/x86/release/staleversion/staleversion-260-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:
reply other threads:[~2020-02-24 13:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200224133107.87059.qmail@sourceware.org \
--to=jturney@sourceware.org \
--cc=cygwin-apps-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).