Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH 1/2] emerge-webrsync: exit early for signature problem (bug 661838)
Date: Mon, 23 Jul 2018 05:40:41
Message-Id: 20180723053751.7900-2-zmedico@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 0/2] webrsync: support sync-openpgp-key-path (bug 661838) by Zac Medico
1 Exit early after signature verification failure, since it's
2 typically inappropriate to try other mirrors in this case
3 (it may indicate a keyring problem).
4
5 Bug: https://bugs.gentoo.org/661838
6 ---
7 bin/emerge-webrsync | 7 +++++++
8 1 file changed, 7 insertions(+)
9
10 diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
11 index 560dd0236..b135567b7 100755
12 --- a/bin/emerge-webrsync
13 +++ b/bin/emerge-webrsync
14 @@ -191,6 +191,13 @@ check_file_signature() {
15 fi
16 done <<< "${gnupg_status}"
17 fi
18 + if [[ ${r} -ne 0 ]]; then
19 + # Exit early since it's typically inappropriate to
20 + # try other mirrors in this case (it may indicate
21 + # a keyring problem).
22 + eecho "signature verification failed"
23 + exit 1
24 + fi
25 else
26 eecho "cannot check signature: gpg binary not found"
27 exit 1
28 --
29 2.13.6