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>master
parent
75690c9f6b
commit
fe55199542
|
@ -54,7 +54,6 @@
|
||||||
`((system . ,(%current-system))
|
`((system . ,(%current-system))
|
||||||
(substitutes? . #t)
|
(substitutes? . #t)
|
||||||
(graft? . #t)
|
(graft? . #t)
|
||||||
(max-silent-time . 3600)
|
|
||||||
(verbosity . 0)))
|
(verbosity . 0)))
|
||||||
|
|
||||||
(define (show-help)
|
(define (show-help)
|
||||||
|
|
|
@ -151,7 +151,6 @@ Copy ITEMS to or from the specified host over SSH.\n"))
|
||||||
`((system . ,(%current-system))
|
`((system . ,(%current-system))
|
||||||
(substitutes? . #t)
|
(substitutes? . #t)
|
||||||
(graft? . #t)
|
(graft? . #t)
|
||||||
(max-silent-time . 3600)
|
|
||||||
(verbosity . 0)))
|
(verbosity . 0)))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -179,7 +179,6 @@ COMMAND or an interactive shell in that environment.\n"))
|
||||||
`((system . ,(%current-system))
|
`((system . ,(%current-system))
|
||||||
(substitutes? . #t)
|
(substitutes? . #t)
|
||||||
(graft? . #t)
|
(graft? . #t)
|
||||||
(max-silent-time . 3600)
|
|
||||||
(verbosity . 0)))
|
(verbosity . 0)))
|
||||||
|
|
||||||
(define (tag-package-arg opts arg)
|
(define (tag-package-arg opts arg)
|
||||||
|
|
|
@ -263,7 +263,6 @@ the image."
|
||||||
(system . ,(%current-system))
|
(system . ,(%current-system))
|
||||||
(substitutes? . #t)
|
(substitutes? . #t)
|
||||||
(graft? . #t)
|
(graft? . #t)
|
||||||
(max-silent-time . 3600)
|
|
||||||
(verbosity . 0)
|
(verbosity . 0)
|
||||||
(symlinks . ())
|
(symlinks . ())
|
||||||
(compressor . ,(first %compressors))))
|
(compressor . ,(first %compressors))))
|
||||||
|
|
|
@ -377,8 +377,7 @@ ENTRIES, a list of manifest entries, in the context of PROFILE."
|
||||||
|
|
||||||
(define %default-options
|
(define %default-options
|
||||||
;; Alist of default option values.
|
;; Alist of default option values.
|
||||||
`((max-silent-time . 3600)
|
`((verbosity . 0)
|
||||||
(verbosity . 0)
|
|
||||||
(graft? . #t)
|
(graft? . #t)
|
||||||
(substitutes? . #t)))
|
(substitutes? . #t)))
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,6 @@ Install it by running:
|
||||||
(system . ,(%current-system))
|
(system . ,(%current-system))
|
||||||
(substitutes? . #t)
|
(substitutes? . #t)
|
||||||
(graft? . #t)
|
(graft? . #t)
|
||||||
(max-silent-time . 3600)
|
|
||||||
(verbosity . 0)))
|
(verbosity . 0)))
|
||||||
|
|
||||||
(define (show-help)
|
(define (show-help)
|
||||||
|
|
|
@ -864,7 +864,6 @@ Some ACTIONS support additional ARGS.\n"))
|
||||||
(substitutes? . #t)
|
(substitutes? . #t)
|
||||||
(graft? . #t)
|
(graft? . #t)
|
||||||
(build-hook? . #t)
|
(build-hook? . #t)
|
||||||
(max-silent-time . 3600)
|
|
||||||
(verbosity . 0)
|
(verbosity . 0)
|
||||||
(file-system-type . "ext4")
|
(file-system-type . "ext4")
|
||||||
(image-size . guess)
|
(image-size . guess)
|
||||||
|
|
Loading…
Reference in New Issue