~ruther/guix-local

fe55199542590d16aa6ca6a8bfa0fda27903db5c — Maxim Cournoyer 8 years ago 75690c9
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>
M guix/scripts/archive.scm => guix/scripts/archive.scm +0 -1
@@ 54,7 54,6 @@
  `((system . ,(%current-system))
    (substitutes? . #t)
    (graft? . #t)
    (max-silent-time . 3600)
    (verbosity . 0)))

(define (show-help)

M guix/scripts/copy.scm => guix/scripts/copy.scm +0 -1
@@ 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)))



M guix/scripts/environment.scm => guix/scripts/environment.scm +0 -1
@@ 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)

M guix/scripts/pack.scm => guix/scripts/pack.scm +0 -1
@@ 263,7 263,6 @@ the image."
    (system . ,(%current-system))
    (substitutes? . #t)
    (graft? . #t)
    (max-silent-time . 3600)
    (verbosity . 0)
    (symlinks . ())
    (compressor . ,(first %compressors))))

M guix/scripts/package.scm => guix/scripts/package.scm +1 -2
@@ 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)))


M guix/scripts/pull.scm => guix/scripts/pull.scm +0 -1
@@ 96,7 96,6 @@ Install it by running:
    (system . ,(%current-system))
    (substitutes? . #t)
    (graft? . #t)
    (max-silent-time . 3600)
    (verbosity . 0)))

(define (show-help)

M guix/scripts/system.scm => guix/scripts/system.scm +0 -1
@@ 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)