| 1 |
commit: ef01e3d9373cb64320df290494c13e3f2cf6a0c0 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 23 04:26:25 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 27 16:08:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ef01e3d9 |
| 7 |
|
| 8 |
emerge-webrsync: exit early for signature problem (bug 661838) |
| 9 |
|
| 10 |
Exit early after signature verification failure, since it's |
| 11 |
typically inappropriate to try other mirrors in this case |
| 12 |
(it may indicate a keyring problem). |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/661838 |
| 15 |
Reviewed-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 16 |
|
| 17 |
bin/emerge-webrsync | 7 +++++++ |
| 18 |
1 file changed, 7 insertions(+) |
| 19 |
|
| 20 |
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync |
| 21 |
index 560dd0236..b135567b7 100755 |
| 22 |
--- a/bin/emerge-webrsync |
| 23 |
+++ b/bin/emerge-webrsync |
| 24 |
@@ -191,6 +191,13 @@ check_file_signature() { |
| 25 |
fi |
| 26 |
done <<< "${gnupg_status}" |
| 27 |
fi |
| 28 |
+ if [[ ${r} -ne 0 ]]; then |
| 29 |
+ # Exit early since it's typically inappropriate to |
| 30 |
+ # try other mirrors in this case (it may indicate |
| 31 |
+ # a keyring problem). |
| 32 |
+ eecho "signature verification failed" |
| 33 |
+ exit 1 |
| 34 |
+ fi |
| 35 |
else |
| 36 |
eecho "cannot check signature: gpg binary not found" |
| 37 |
exit 1 |
Archives