summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-10-21 19:29:47 -0500
committerDan McGee <dan@archlinux.org>2011-10-21 19:29:47 -0500
commit90ddcbe71d483884b7627237121b1dee05b07dd0 (patch)
tree3a7ab12ede83453d24747065f5f27a78c8c51fbf /scripts
parent33bb7dbd356bd1164a1bd6418c0615808fae13f7 (diff)
parentd6e3446e70bcda9c0f28d80110d588106daa4b5c (diff)
downloadpacman-90ddcbe71d483884b7627237121b1dee05b07dd0.tar.xz
Merge branch 'maint'
Conflicts: src/pacman/package.c Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
-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