aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2018-07-26 23:30:36 -0700
committerZac Medico <zmedico@gentoo.org>2018-07-27 22:53:08 -0700
commitdd307922c584faa8be13468261dbedb0cc65b181 (patch)
tree9526ae5eace5fd61b7e3bcd649d21bcb76deb1ba
parentwebrsync: support sync-webrsync-keep-snapshots (diff)
downloadportage-dd307922c584faa8be13468261dbedb0cc65b181.tar.gz
portage-dd307922c584faa8be13468261dbedb0cc65b181.tar.bz2
portage-dd307922c584faa8be13468261dbedb0cc65b181.zip
emerge-delta-webrsync: exit early for signature problem (bug 661838)
Exit early after signature verification failure, since it's typically inappropriate to try other mirrors in this case (it may indicate a keyring problem). Bug: https://bugs.gentoo.org/661838 Reviewed-by: Brian Dolbec <dolsen@gentoo.org>
-rwxr-xr-xmisc/emerge-delta-webrsync7
1 files changed, 7 insertions, 0 deletions
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 868c6a347..ebaa616f9 100755
--- a/misc/emerge-delta-webrsync
+++ b/misc/emerge-delta-webrsync
@@ -283,6 +283,13 @@ check_file_signature() {
fi
done <<< "${gnupg_status}"
fi
+ if [[ ${r} -ne 0 ]]; then
+ # Exit early since it's typically inappropriate to
+ # try other mirrors in this case (it may indicate
+ # a keyring problem).
+ eecho "signature verification failed"
+ exit 1
+ fi
else
eecho "cannot check signature: gpg binary not found"
exit 1