From fe55199542590d16aa6ca6a8bfa0fda27903db5c Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 30 Aug 2017 23:12:12 -0400
Subject: [PATCH] scripts: Remove 'max-silent-time' from the default options.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes <http://bugs.gnu.org/27157>.

Having a finite default `max-silent-time' value for scripts such as 'guix
environment' could lead to timeouts when building subtitutes; this was
undesirable.

This change also fixes client behavior to match the documentation, which
is that by default the daemon's settings are honored.

* guix/scripts/archive.scm (%default-options): Remove max-silent-time entry.
* guix/scripts/copy.scm (%default-options): Likewise.
* guix/scripts/environment.scm (%default-options): Likewise.
* guix/scripts/pack.scm (%default-options): Likewise.
* guix/scripts/package.scm (%default-options): Likewise.
* guix/scripts/pull.scm (%default-options): Likewise.
* guix/scripts/system.scm (%default-options): Likewise.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/scripts/archive.scm     | 1 -
 guix/scripts/copy.scm        | 1 -
 guix/scripts/environment.scm | 1 -
 guix/scripts/pack.scm        | 1 -
 guix/scripts/package.scm     | 3 +--
 guix/scripts/pull.scm        | 1 -
 guix/scripts/system.scm      | 1 -
 7 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index 5ea19784dc5e314c5bd7bb417684696f1531405b..a569848ae3e9f02676780c49228e9fa632c24fa9 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -54,7 +54,6 @@
   `((system . ,(%current-system))
     (substitutes? . #t)
     (graft? . #t)
-    (max-silent-time . 3600)
     (verbosity . 0)))
 
 (define (show-help)
diff --git a/guix/scripts/copy.scm b/guix/scripts/copy.scm
index 32438b99d952a2c68d09f5994088c998542d604a..9ffffe8ccdbdb8a459288a1ceeffc0dc128973e6 100644
--- a/guix/scripts/copy.scm
+++ b/guix/scripts/copy.scm
@@ -151,7 +151,6 @@ Copy ITEMS to or from the specified host over SSH.\n"))
   `((system . ,(%current-system))
     (substitutes? . #t)
     (graft? . #t)
-    (max-silent-time . 3600)
     (verbosity . 0)))
 
 
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 95ba199d97138166e4f0621017963b6bd76de5b4..0d6921833847d757b56c424daa71c083344fc15f 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -179,7 +179,6 @@ COMMAND or an interactive shell in that environment.\n"))
   `((system . ,(%current-system))
     (substitutes? . #t)
     (graft? . #t)
-    (max-silent-time . 3600)
     (verbosity . 0)))
 
 (define (tag-package-arg opts arg)
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index c269a1fefc7d0819aa87def32b94beaf007b892a..21fea446a6ad097d279eed308054b0b1a4611e71 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -263,7 +263,6 @@ the image."
     (system . ,(%current-system))
     (substitutes? . #t)
     (graft? . #t)
-    (max-silent-time . 3600)
     (verbosity . 0)
     (symlinks . ())
     (compressor . ,(first %compressors))))
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index fa45bd48a64c89ad4abcd2b5761e55925d0de9ae..9ec6950c4bbbd1594e7580aa40d0bbbe9a13636a 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -377,8 +377,7 @@ ENTRIES, a list of manifest entries, in the context of PROFILE."
 
 (define %default-options
   ;; Alist of default option values.
-  `((max-silent-time . 3600)
-    (verbosity . 0)
+  `((verbosity . 0)
     (graft? . #t)
     (substitutes? . #t)))
 
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index a1deec80400de17e09efd02f3ab8620ac43a5ff7..b1c87c870e7c62581e1de76e00849b68804f9be9 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -96,7 +96,6 @@ Install it by running:
     (system . ,(%current-system))
     (substitutes? . #t)
     (graft? . #t)
-    (max-silent-time . 3600)
     (verbosity . 0)))
 
 (define (show-help)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 8793c40925b4478a3764a4edc8271a63aa283daa..77377931897ac3634983158fb5f856f3cbf88538 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -864,7 +864,6 @@ Some ACTIONS support additional ARGS.\n"))
     (substitutes? . #t)
     (graft? . #t)
     (build-hook? . #t)
-    (max-silent-time . 3600)
     (verbosity . 0)
     (file-system-type . "ext4")
     (image-size . guess)