diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2024-07-14 23:29:43 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2024-07-14 23:29:43 +0100 |
| commit | f1ba93721c337063b5a372498e49ba11e5dc2a22 (patch) | |
| tree | 0ba95f99e0e20086f7d4115ad8423764f184f570 /sec-keys | |
| parent | app-portage/portpeek: Enable python 3.13 (diff) | |
| download | gentoo-f1ba93721c337063b5a372498e49ba11e5dc2a22.tar.gz gentoo-f1ba93721c337063b5a372498e49ba11e5dc2a22.tar.bz2 gentoo-f1ba93721c337063b5a372498e49ba11e5dc2a22.zip | |
sec-keys/openpgp-keys-gentoo-developers: Fix src_test after adding check
keyring-mangler now fails with no valid keys, but there were no valid keys in
the test. Fix this by importing our already-sanitised list.
Closes: https://bugs.gentoo.org/936051
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'sec-keys')
3 files changed, 9 insertions, 0 deletions
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240422.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240422.ebuild index 537b42c72cc6..f0c8cb1b5c51 100644 --- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240422.ebuild +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240422.ebuild @@ -143,6 +143,9 @@ src_test() { echo "Hello world!" > "${T}"/tests/signme || die edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die + # keyring-mangler will fail with no valid keys so import the sanitised list from src_compile. + edo gpg "${mygpgargs[@]}" --import "${WORKDIR}"/gentoo-developers-sanitised.asc + edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc # keyring-mangler.py should now produce a keyring *without* it diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240708.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240708.ebuild index d5cf1e259a4d..8b5c37e28529 100644 --- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240708.ebuild +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240708.ebuild @@ -143,6 +143,9 @@ src_test() { echo "Hello world!" > "${T}"/tests/signme || die edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die + # keyring-mangler will fail with no valid keys so import the sanitised list from src_compile. + edo gpg "${mygpgargs[@]}" --import "${WORKDIR}"/gentoo-developers-sanitised.asc + edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc # keyring-mangler.py should now produce a keyring *without* it diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild index d5cf1e259a4d..8b5c37e28529 100644 --- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild @@ -143,6 +143,9 @@ src_test() { echo "Hello world!" > "${T}"/tests/signme || die edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die + # keyring-mangler will fail with no valid keys so import the sanitised list from src_compile. + edo gpg "${mygpgargs[@]}" --import "${WORKDIR}"/gentoo-developers-sanitised.asc + edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc # keyring-mangler.py should now produce a keyring *without* it |