[gentoo-commits] proj/qa-scripts:master commit in: /

[Robin H. Johnson]

commit:     faf8249fd0204de022caa61f215a723203d2e94d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 03:39:42 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May  4 03:39:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=faf8249f

keyrings: fix timeout

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 keyrings.inc.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 0c45e68..20f8db9 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -32,7 +32,7 @@ grab_keys() {
        KEYSERVER_TIMEOUT=${KEYSERVER_TIMEOUT:=1m}
        while :; do
                for ks in "${KEYSERVERS[@]}" ; do
-                       timeout ${KEYSERVER_TIMEOUT}  gpg --keyserver "$ks" -q 
--recv-keys "${remaining[@]}" || :
+                       timeout ${KEYSERVER_TIMEOUT} gpg --keyserver "$ks" -q 
--recv-keys "${remaining[@]}" || :
                done
                missing=()
                for key in "${remaining[@]}"; do
@@ -61,7 +61,7 @@ push_keys() {
        local remaining=( $(gpg --with-colon --list-public "${@}" | sed -n 
'/^pub/{n; /fpr/p }' |cut -d: -f10) )
        KEYSERVER_TIMEOUT=${KEYSERVER_TIMEOUT:=1m}
        for ks in "${KEYSERVERS[@]}" ; do
-               timeout 5m  ${KEYSERVER_TIMEOUT} g --keyserver "$ks" -q 
--send-keys "${remaining[@]}" || :
+               timeout ${KEYSERVER_TIMEOUT} g --keyserver "$ks" -q --send-keys 
"${remaining[@]}" || :
        done
 }