Browse Source

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>
version-0.14.0
Maxim Cournoyer 4 years ago
committed by Ludovic Courtès
parent
commit
fe55199542
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 1
      guix/scripts/archive.scm
  2. 1
      guix/scripts/copy.scm
  3. 1
      guix/scripts/environment.scm
  4. 1
      guix/scripts/pack.scm
  5. 3
      guix/scripts/package.scm
  6. 1
      guix/scripts/pull.scm
  7. 1
      guix/scripts/system.scm

1
guix/scripts/archive.scm

@ -54,7 +54,6 @@
`((system . ,(%current-system))
(substitutes? . #t)
(graft? . #t)
(max-silent-time . 3600)
(verbosity . 0)))
(define (show-help)

1
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)))

1
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)

1
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))))

3
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)))

1
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)

1
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)

Loading…
Cancel
Save