diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-10-16 02:00:03 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-10-16 02:00:28 +0200 |
| commit | 9a0a786c2555b7e9bcef2a27dff8b82c002799ab (patch) | |
| tree | 7d654e5a663218e8779feb9ddc53a764f53dcba7 | |
| parent | 88ec7bf616a5d2559d1203331f2129601b082110 (diff) | |
| download | guix-9a0a786c2555b7e9bcef2a27dff8b82c002799ab.tar.gz | |
guix-install.sh: Time out fetching OpenPGP keys.
The default 900s provide no useful backstop in interactive use. * etc/guix-install.sh (chk_gpg_keyring): Add a 30s wget --timeout.
| -rwxr-xr-x | etc/guix-install.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 3604c71ed6..3fad9deb1f 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -141,8 +141,10 @@ chk_gpg_keyring() if prompt_yes_no "${INF}The following OpenPGP public key is \ required to verify the Guix binary signature: $gpg_key_id. Would you like me to fetch it for you?"; then + # Use a reasonable time-out here so users don't report silent + # ‘freezes’ when Savannah goes out to lunch, as has happened. wget "https://sv.gnu.org/people/viewgpg.php?user_id=$user_id" \ - --no-verbose -O- | gpg --import - + --timeout=30 --no-verbose -O- | gpg --import - else _err "${ERR}Missing OpenPGP public key ($gpg_key_id). Fetch it with this command: |