commit:     dd307922c584faa8be13468261dbedb0cc65b181
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 27 06:30:36 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 05:53:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=dd307922

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 <AT> gentoo.org>

 misc/emerge-delta-webrsync | 7 +++++++
 1 file changed, 7 insertions(+)

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

Reply via email to