aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-04-30 06:30:13 +0100
committerSam James <sam@gentoo.org>2023-05-01 08:20:57 +0100
commit47abd292da1f2b0bded9f7d4ad21130d18d4a719 (patch)
treea5a5bf202cfcebbe908aa467296a7e7a594ff0bc /bin
parentsync: webrsync: export PORTAGE_GPG_KEY for emerge-webrsync (diff)
downloadportage-47abd292da1f2b0bded9f7d4ad21130d18d4a719.tar.gz
portage-47abd292da1f2b0bded9f7d4ad21130d18d4a719.tar.bz2
portage-47abd292da1f2b0bded9f7d4ad21130d18d4a719.zip
emerge-webrsync: respect PORTAGE_GPG_KEY
This will allow us to switch the Portage-caller cases to the gemato path because we now respect 'sync-openpgp-key-path'. Bug: https://bugs.gentoo.org/905358 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge-webrsync8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 11d6937cd..b59b728c6 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -272,9 +272,15 @@ check_file_signature_gemato() {
local r=1
if type -P gemato > /dev/null; then
+ if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
+ local key="${PORTAGE_GPG_KEY}"
+ else
+ local key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+ fi
+
local gemato_args=(
openpgp-verify-detached
- -K "${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+ -K "${key}"
)
[[ ${PORTAGE_QUIET} == 1 ]] && gemato_args+=( --quiet )