index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Eli Schwartz <eschwartz@archlinux.org> | 2019-10-06 23:11:19 -0400 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2019-10-07 13:23:11 +1000 |
commit | f49233903521f19a1fcba6bf6c36abea71309a1e (patch) | |
tree | 9a841b16c6b0b34ef478f8b28fc61c8122aca46a /scripts | |
parent | 45e01e55c96d9abf8c73f6ee3766b16e5fbefc4d (diff) |
-rw-r--r-- | scripts/pacman-key.sh.in | 5 |
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index c3b02850..93600bc0 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -210,6 +210,11 @@ initialize() { add_gpg_conf_option "$conffile" 'lock-never' add_gpg_conf_option "$conffile" 'keyserver-options' 'timeout=10' + local gpg_ver=$(gpg --version | awk '{print $3; exit}') + if (( $(vercmp "$gpg_ver" 2.2.17) >= 0 )); then + add_gpg_conf_option "$conffile" 'keyserver-options' 'no-self-sigs-only' + fi + # gpg-agent.conf agent_conffile="${PACMAN_KEYRING_DIR}/gpg-agent.conf" [[ -f $agent_conffile ]] || touch "$agent_conffile" |