diff options
| author |   Sam James <sam@gentoo.org> | 2023-06-09 14:03:44 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-06-09 14:03:44 +0100 |
| commit | 12164035655e5cea4f83f9955bdb4db3369af7e3 (patch) | |
| tree | a89047fe5042886e7d3275e0eeb0e295b32d0bcd | |
| parent | dosym: Fix another corner case of strange input (diff) | |
| download | portage-12164035.tar.gz portage-12164035.tar.bz2 portage-12164035.zip | |
emerge-webrsync: improve error message when key is missing
Bug: https://bugs.gentoo.org/905868
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | NEWS | 3 | ||||
| -rwxr-xr-x | bin/emerge-webrsync | 10 |
2 files changed, 13 insertions, 0 deletions
@@ -1,6 +1,9 @@ Bug fixes: * dosym: Prevent globbing of argument in dosym_canonicalize(). +* emerge-webrsync: Give a nicer error message if the requested key isn't + on the filesystem (bug #905868). + portage-3.0.48.1 (2023-06-06) ---------------- diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 956e00e1f..3835977fc 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -279,6 +279,11 @@ check_file_signature_gemato() { local key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc fi + if [[ ! -f "${key}" ]] ; then + eerror "${key} not available. Is sec-keys/openpgp-keys-gentoo-release installed?" + die "Needed keys unavailable! Install its package or set PORTAGE_GPG_KEY to the right path." + fi + local keyserver if [[ -n ${PORTAGE_GPG_KEY_SERVER} ]] ; then keyserver="--keyserver ${PORTAGE_GPG_KEY_SERVER}" @@ -320,6 +325,11 @@ check_file_signature_gpg_unwrapped() { local key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc fi + if [[ ! -f "${key}" ]] ; then + eerror "${key} not available. Is sec-keys/openpgp-keys-gentoo-release installed?" + die "Needed keys unavailable! Install its package or set PORTAGE_GPG_KEY to the right path." + fi + local gpgdir="${PORTAGE_GPG_DIR}" if [[ -z ${gpgdir} ]] ; then gpgdir=$(mktemp -d "${PORTAGE_TMPDIR}/portage/webrsync-XXXXXX") |