summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-10-17 16:42:46 +0200
committerDan McGee <dan@archlinux.org>2011-10-17 16:42:46 +0200
commit4bada454643e6d91f0b53415bc8d135bc7f578b5 (patch)
treebcda0cb592aaefb5fb0293e234e44763aa68437f
parentbac670ddc9a9dcad2f0665f9f77d04b6736c6db4 (diff)
downloadpacman-4bada454643e6d91f0b53415bc8d135bc7f578b5.tar.gz
pacman-4bada454643e6d91f0b53415bc8d135bc7f578b5.tar.xz
pacman-key: add a default keyserver timeout value on --init
The default is supposidely 30 seconds from the gpg manpage, but that sure wasn't what I was seeing- it was somewhere closer to two minutes of silence. Add a more reasonable 10 second timeout value which should be good enough for any keyserver that doesn't totally stink at it's job. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/pacman-key.sh.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 558d6158..ee43dde1 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -166,6 +166,7 @@ initialize() {
add_gpg_conf_option "$conffile" 'lock-never'
keyserv=${KEYSERVER:-$DEFAULT_KEYSERVER}
add_gpg_conf_option "$conffile" 'keyserver' "$keyserv"
+ add_gpg_conf_option "$conffile" 'keyserver-options' 'timeout=10'
# set up a private signing key (if none available)
if [[ $(secret_keys_available) -lt 1 ]]; then