From 9a0a786c2555b7e9bcef2a27dff8b82c002799ab Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Oct 2022 02:00:03 +0200
Subject: [PATCH] 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.
---
 etc/guix-install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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: