01/05: scripts: Remove 'max-silent-time' from the default options.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit fe55199542590d16aa6ca6a8bfa0fda27903db5c
Author: Maxim Cournoyer <address@hidden>
Date:   Wed Aug 30 23:12:12 2017 -0400

    scripts: Remove 'max-silent-time' from the default options.
    
    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 <address@hidden>
---
 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 5ea1978..a569848 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 32438b9..9ffffe8 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 95ba199..0d69218 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 c269a1f..21fea44 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 fa45bd4..9ec6950 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 a1deec8..b1c87c8 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 8793c40..7737793 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)