summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2017-08-30 23:12:12 -0400
committerLudovic Courtès <ludo@gnu.org>2017-09-01 10:29:39 +0200
commitfe55199542590d16aa6ca6a8bfa0fda27903db5c (patch)
treed1d492cd0445c1e16ca13774c54de950c21dade7
parent75690c9f6bd7909868ae0f91ee7f3cf9e0be1942 (diff)
downloadpatches-fe55199542590d16aa6ca6a8bfa0fda27903db5c.tar
patches-fe55199542590d16aa6ca6a8bfa0fda27903db5c.tar.gz
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 <ludo@gnu.org>
-rw-r--r--guix/scripts/archive.scm1
-rw-r--r--guix/scripts/copy.scm1
-rw-r--r--guix/scripts/environment.scm1
-rw-r--r--guix/scripts/pack.scm1
-rw-r--r--guix/scripts/package.scm3
-rw-r--r--guix/scripts/pull.scm1
-rw-r--r--guix/scripts/system.scm1
7 files changed, 1 insertions, 8 deletions
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index 5ea19784dc..a569848ae3 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 32438b99d9..9ffffe8ccd 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 95ba199d97..0d69218338 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 c269a1fefc..21fea446a6 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 fa45bd48a6..9ec6950c4b 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 a1deec8040..b1c87c870e 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 8793c40925..7737793189 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)