pull, time-machine: ‘--allow-untrusted-channels’ takes an argument.

* guix/scripts/pull.scm (%default-options): Change ‘require-trusted-channels?’
to ‘require-trusted-channels’.
(show-help, %options): Support optional argument to
‘--allow-untrusted-channels’.
(channel-list): Adjust accordingly.
* guix/scripts/time-machine.scm (show-help, %options)
(%default-options): Likewise.
* tests/guix-time-machine.sh: Add test.
* doc/guix.texi (Invoking guix pull)
(Invoking guix time-machine): Adjust accordingly.

Suggested-by: Reepca Russelstein <reepca@russelstein.xyz>
Change-Id: I342ebbcc7355953487a5c6c8ac85048943a5ac46
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/guix-time-machine.sh b/tests/guix-time-machine.sh
index 262e3d5fef8..e61232f94fa 100644
--- a/tests/guix-time-machine.sh
+++ b/tests/guix-time-machine.sh
@@ -74,6 +74,17 @@ cat > "$channels_file" <<EOF
 EOF
 guix repl -- "$channels_file"
 
+# Under 'pre-inst-env', there are zero trusted channels by default.
+cat > "$channels_file" <<EOF
+%default-channels
+EOF
+
+# Ignore the user's ~/.config/guix/trusted-channels.scm and ensure this
+# command fails.
+XDG_CONFIG_HOME="$XDG_CACHE_HOME/dot-config" \
+guix time-machine -C "$channels_file" --allow-untrusted-channels=no 2> "$log_file" && false
+grep "'guix' is not trusted" "$log_file"
+
 if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
 then
     # Ignore the user's ~/.config/guix/trusted-channels.scm.  Under