[bug#66499] [PATCH] ui: Handle EPIPE errors when displaying Guix version.

[bug#66499] [PATCH] ui: Handle EPIPE errors when displaying Guix version.

[Simon Tournier]

Fixes <https://issues.guix.gnu.org/66254>.
Reported by Clément Lassieur <clement@lassieur.org>.

* guix/ui.scm (run-guix): Handle EPIPE errors when displaying version.
---
 guix/ui.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Hi,

It appears to me a trivial patch that could directly could go be merged but
just in case I am not missing the obvious.

Cheers,
simon


diff --git a/guix/ui.scm b/guix/ui.scm
index 6f2d4fe245..507bc67f1d 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -2309,7 +2309,7 @@ (define (run-guix . args)
       ((or ("-h") ("--help"))
        (leave-on-EPIPE (show-guix-help)))
       ((or ("-V") ("--version"))
-       (show-version-and-exit "guix"))
+       (leave-on-EPIPE (show-version-and-exit "guix")))
       (((? option? o) args ...)
        (format (current-error-port)
                (G_ "guix: unrecognized option '~a'~%") o)

base-commit: 1328c4cca531318e3ed90c6aecb522a5b22a4bcc
-- 
2.38.1

[bug#66499] [PATCH] ui: Handle EPIPE errors when displaying Guix version.

[Mathieu Othacehe]

Hello Simon,

> Fixes <https://issues.guix.gnu.org/66254>.
> Reported by Clément Lassieur <clement@lassieur.org>.
>
> * guix/ui.scm (run-guix): Handle EPIPE errors when displaying version.

This fixes this very issue for me too. However, all the following
commands are still failing:

guix package --help|head -1
guix package --version|head -1
guix pull --version|head -1
guix pull --help|head -1

and basically all the commands using show-version-and-exit. Do you need
a more systemic approach?

Thanks,

Mathieu

[bug#66499] [PATCH] ui: Handle EPIPE errors when displaying Guix version.

[Simon Tournier]

Hi Mathieu,

On Sat, 14 Oct 2023 at 10:13, Mathieu Othacehe <othacehe@gnu.org> wrote:

> This fixes this very issue for me too. However, all the following
> commands are still failing:
>
> guix package --help|head -1
> guix package --version|head -1
> guix pull --version|head -1
> guix pull --help|head -1

Thanks.  Fixed and the remaining others too.

> and basically all the commands using show-version-and-exit. Do you need
> a more systemic approach?

Well, I do not think we can do really better than add leave-on-EPIPE
here or there.

Maybe we could have some “define-show-help” that wraps ’show-help’
definition with leave-on-EPIPE but the effort (find-replace) is not
worth some quick additions here or there, IMHO.

Well, the first patch fixes --version for all subcommands.  All the
others deal with --help.  Now, no backtraces.

--8<---------------cut here---------------start------------->8---
$ for cmd in $(find guix/scripts -name "*.scm" -type f -exec basename {} .scm \; | sort); do ./pre-inst-env guix $cmd --version | head -1 ;done
guix archive (GNU Guix) UNKNOWN
guix authenticate (GNU Guix) UNKNOWN
guix authenticate (GNU Guix) UNKNOWN
guix build (GNU Guix) UNKNOWN
guix challenge (GNU Guix) UNKNOWN
guix container (GNU Guix) UNKNOWN
guix copy (GNU Guix) UNKNOWN
guix: cpan: command not found
Try `guix --help' for more information.
guix: cran: command not found
Try `guix --help' for more information.
guix: crate: command not found
Try `guix --help' for more information.
guix deploy (GNU Guix) UNKNOWN
guix describe (GNU Guix) UNKNOWN
guix discover (GNU Guix) UNKNOWN
guix download (GNU Guix) UNKNOWN
guix edit (GNU Guix) UNKNOWN
guix edit (GNU Guix) UNKNOWN
guix edit (GNU Guix) UNKNOWN
guix: egg: command not found
hint: Did you mean `gc'?

Try `guix --help' for more information.
guix: elm: command not found
Try `guix --help' for more information.
guix: elpa: command not found
Try `guix --help' for more information.
guix environment (GNU Guix) UNKNOWN
guix: exec: command not found
Try `guix --help' for more information.
guix gc (GNU Guix) UNKNOWN
guix: gem: command not found
hint: Did you mean `gc'?

Try `guix --help' for more information.
guix git (GNU Guix) UNKNOWN
guix: gnu: command not found
hint: Did you mean `gc'?

Try `guix --help' for more information.
guix: go: command not found
hint: Did you mean `gc'?

Try `guix --help' for more information.
guix graph (GNU Guix) UNKNOWN
guix: hackage: command not found
hint: Did you mean `package'?

Try `guix --help' for more information.
guix hash (GNU Guix) UNKNOWN
guix: hexpm: command not found
Try `guix --help' for more information.
guix home (GNU Guix) UNKNOWN
guix import (GNU Guix) UNKNOWN
guix import (GNU Guix) UNKNOWN
guix install (GNU Guix) UNKNOWN
guix: json: command not found
Try `guix --help' for more information.
guix lint (GNU Guix) UNKNOWN
guix locate (GNU Guix) UNKNOWN
guix: minetest: command not found
Try `guix --help' for more information.
guix offload (GNU Guix) UNKNOWN
guix: opam: command not found
Try `guix --help' for more information.
guix pack (GNU Guix) UNKNOWN
guix package (GNU Guix) UNKNOWN
/home/simon/src/guix/guix/scripts/guix (GNU Guix) UNKNOWN
guix processes (GNU Guix) UNKNOWN
guix publish (GNU Guix) UNKNOWN
guix pull (GNU Guix) UNKNOWN
guix: pypi: command not found
Try `guix --help' for more information.
guix: reconfigure: command not found
Try `guix --help' for more information.
guix refresh (GNU Guix) UNKNOWN
guix remove (GNU Guix) UNKNOWN
guix repl (GNU Guix) UNKNOWN
guix search (GNU Guix) UNKNOWN
guix search (GNU Guix) UNKNOWN
guix shell (GNU Guix) UNKNOWN
guix show (GNU Guix) UNKNOWN
guix size (GNU Guix) UNKNOWN
guix: stackage: command not found
hint: Did you mean `package'?

Try `guix --help' for more information.
guix style (GNU Guix) UNKNOWN
guix substitute (GNU Guix) UNKNOWN
guix system (GNU Guix) UNKNOWN
guix: texlive: command not found
Try `guix --help' for more information.
guix time-machine (GNU Guix) UNKNOWN
guix upgrade (GNU Guix) UNKNOWN
guix weather (GNU Guix) UNKNOWN
--8<---------------cut here---------------end--------------->8---

--8<---------------cut here---------------start------------->8---
$ for cmd in $(find guix/scripts -name "*.scm" -type f -exec basename {} .scm \; | sort); do ./pre-inst-env guix $cmd --help | head -1 ;done
Usage: guix archive [OPTION]... PACKAGE...
Usage: guix authenticate OPTION...
Usage: guix authenticate OPTION...
Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...
Usage: guix challenge [PACKAGE...]
Usage: guix container ACTION ARGS...
Usage: guix copy [OPTION]... ITEMS...
guix: cpan: command not found
Try `guix --help' for more information.
guix: cran: command not found
Try `guix --help' for more information.
guix: crate: command not found
Try `guix --help' for more information.
Usage: guix deploy [OPTION] FILE...
Usage: guix describe [OPTION]...
Usage: guix discover [OPTION]...
Usage: guix download [OPTION] URL
Usage: guix edit PACKAGE...
Usage: guix edit PACKAGE...
Usage: guix edit PACKAGE...
guix: egg: command not found
hint: Did you mean `gc'?

Try `guix --help' for more information.
guix: elm: command not found
Try `guix --help' for more information.
guix: elpa: command not found
Try `guix --help' for more information.
Usage: guix environment [OPTION]... PACKAGE... [-- COMMAND...]
guix environment: warning: This command is deprecated in favor of 'guix shell'.
guix environment: error: fport_write: Broken pipe
guix: exec: command not found
Try `guix --help' for more information.
Usage: guix gc [OPTION]... PATHS...
guix: gem: command not found
hint: Did you mean `gc'?

Try `guix --help' for more information.
Usage: guix git COMMAND ARGS...
guix: gnu: command not found
hint: Did you mean `gc'?

Try `guix --help' for more information.
guix: go: command not found
hint: Did you mean `gc'?

Try `guix --help' for more information.
Usage: guix graph PACKAGE...
guix: hackage: command not found
hint: Did you mean `package'?

Try `guix --help' for more information.
Usage: guix hash [OPTION] FILE
guix: hexpm: command not found
Try `guix --help' for more information.
Usage: guix home [OPTION ...] ACTION [ARG ...] [FILE]
Usage: guix import IMPORTER ARGS ...
Usage: guix import IMPORTER ARGS ...
Usage: guix install [OPTION] PACKAGES...
guix: json: command not found
Try `guix --help' for more information.
Usage: guix lint [OPTION]... [PACKAGE]...
Usage: guix locate [OPTIONS...] FILE...
guix: minetest: command not found
Try `guix --help' for more information.
Usage: guix offload SYSTEM MAX-SILENT-TIME PRINT-BUILD-TRACE? BUILD-TIMEOUT
guix: opam: command not found
Try `guix --help' for more information.
Usage: guix pack [OPTION]... PACKAGE...
Usage: guix package [OPTION]...
guix perform-download: error: fixed-output derivation and output file name expected
Usage: guix processes
Usage: guix publish [OPTION]...
Usage: guix pull [OPTION]...
guix: pypi: command not found
Try `guix --help' for more information.
guix: reconfigure: command not found
Try `guix --help' for more information.
Usage: guix refresh [OPTION]... [PACKAGE]...
Usage: guix remove [OPTION] PACKAGES...
Usage: guix repl [OPTIONS...] [-- FILE ARGS...]
Usage: guix search [OPTION] REGEXPS...
Usage: guix search [OPTION] REGEXPS...
Usage: guix shell [OPTION] PACKAGES... [-- COMMAND...]
Usage: guix show [OPTION] PACKAGE...
Usage: guix size [OPTION]... PACKAGE|STORE-ITEM
guix: stackage: command not found
hint: Did you mean `package'?

Try `guix --help' for more information.
Usage: guix style [OPTION]... [PACKAGE]...
Usage: guix substitute OPTION [ARGUMENT]...
Usage: guix system [OPTION ...] ACTION [ARG ...] [FILE]
guix: texlive: command not found
Try `guix --help' for more information.
Usage: guix time-machine [OPTION] -- COMMAND ARGS...
Usage: guix upgrade [OPTION] [REGEXP]
Usage: guix weather [OPTIONS] [PACKAGES ...]
--8<---------------cut here---------------end--------------->8---

Cheers,
simon

[bug#66499] [PATCH v2 01/39] ui: Handle EPIPE errors when displaying Guix version.

[Simon Tournier]

Fixes <https://issues.guix.gnu.org/66254>.
Reported by Clément Lassieur <clement@lassieur.org>.

* guix/ui.scm (show-version-and-exit): Handle EPIPE errors when displaying
version.
---
 guix/ui.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 6f2d4fe245..e3bf07212f 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -552,19 +552,20 @@ (define (initialize-guix)
 
 (define* (show-version-and-exit #:optional (command (car (command-line))))
   "Display version information for COMMAND and `(exit 0)'."
-  (simple-format #t "~a (~a) ~a~%"
-                 command %guix-package-name %guix-version)
-  (format #t "Copyright ~a 2023 ~a"
-          ;; TRANSLATORS: Translate "(C)" to the copyright symbol
-          ;; (C-in-a-circle), if this symbol is available in the user's
-          ;; locale.  Otherwise, do not translate "(C)"; leave it as-is.  */
-          (G_ "(C)")
-          (G_ "the Guix authors\n"))
-  (display (G_"\
+  (leave-on-EPIPE
+   (simple-format #t "~a (~a) ~a~%"
+                  command %guix-package-name %guix-version)
+   (format #t "Copyright ~a 2023 ~a"
+           ;; TRANSLATORS: Translate "(C)" to the copyright symbol
+           ;; (C-in-a-circle), if this symbol is available in the user's
+           ;; locale.  Otherwise, do not translate "(C)"; leave it as-is.  */
+           (G_ "(C)")
+           (G_ "the Guix authors\n"))
+   (display (G_"\
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
-"))
+")))
   (exit 0))
 
 (define (show-bug-report-information)

base-commit: b6a070d2a3c059c1a574dc4048fb8f942e008799
-- 
2.38.1

[bug#66499] [PATCH v2 02/39] scripts: archive: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/archive.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/archive.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index e32f22ec99..2b5a55a23f 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -119,7 +119,7 @@ (define %options
   ;; Specifications of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 03/39] scripts: build: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/build.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/build.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 72a24f91ac..05f022a92e 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -477,7 +477,7 @@ (define %options
   ;; Specifications of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 04/39] scripts: challenge: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/challenge.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/challenge.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm
index 4821e11bf6..01e2f9a2b2 100644
--- a/guix/scripts/challenge.scm
+++ b/guix/scripts/challenge.scm
@@ -467,7 +467,7 @@ (define (show-help)
 (define %options
   (list  (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 05/39] scripts: container: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/container.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/container.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/container.scm b/guix/scripts/container.scm
index 2369437043..70637bca29 100644
--- a/guix/scripts/container.scm
+++ b/guix/scripts/container.scm
@@ -57,7 +57,7 @@ (define-command (guix-container . args)
        (format (current-error-port)
                (G_ "guix container: missing action~%")))
       ((or ("-h") ("--help"))
-       (show-help)
+       (leave-on-EPIPE (show-help))
        (exit 0))
       ((or ("-V") ("--version"))
        (show-version-and-exit "guix container"))
-- 
2.38.1

[bug#66499] [PATCH v2 06/39] scripts: copy: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/copy.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/copy.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/copy.scm b/guix/scripts/copy.scm
index 07357af420..67975ac1a9 100644
--- a/guix/scripts/copy.scm
+++ b/guix/scripts/copy.scm
@@ -150,7 +150,7 @@ (define %options
 
          (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 07/39] scripts: deploy: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/deploy.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/deploy.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
index 14ce736174..4b1a603049 100644
--- a/guix/scripts/deploy.scm
+++ b/guix/scripts/deploy.scm
@@ -68,7 +68,7 @@ (define (show-help)
 (define %options
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 08/39] scripts: describe: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/describe.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/describe.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index 5523aa0ec2..6d451dc902 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -74,7 +74,7 @@ (define %options
                               result)))
         (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 09/39] scripts: discover: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/discover.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/discover.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/discover.scm b/guix/scripts/discover.scm
index 8970f835c9..32bf6085a5 100644
--- a/guix/scripts/discover.scm
+++ b/guix/scripts/discover.scm
@@ -50,7 +50,7 @@ (define %options
                   (alist-cons 'cache arg result)))
         (option '(#\h "help") #f #f
                 (lambda _
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda _
-- 
2.38.1

[bug#66499] [PATCH v2 10/39] scripts: download: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/download.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/download.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm
index 0ab5c8c39c..0441d3fead 100644
--- a/guix/scripts/download.scm
+++ b/guix/scripts/download.scm
@@ -143,7 +143,7 @@ (define %options
 
         (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 11/39] scripts: edit: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/edit.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/edit.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm
index 5ce2870c5a..ff2d529bcf 100644
--- a/guix/scripts/edit.scm
+++ b/guix/scripts/edit.scm
@@ -37,7 +37,7 @@ (define %options
               %standard-build-options)
         (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 12/39] scripts: gc: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/gc.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/gc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm
index 6068f5fe3f..58af827617 100644
--- a/guix/scripts/gc.scm
+++ b/guix/scripts/gc.scm
@@ -132,7 +132,7 @@ (define %options
   ;; Specification of the command-line options.
   (list (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 13/39] scripts: git: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/git.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/git.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/git.scm b/guix/scripts/git.scm
index 4436d8a6e0..abbad076cd 100644
--- a/guix/scripts/git.scm
+++ b/guix/scripts/git.scm
@@ -56,7 +56,7 @@ (define-command (guix-git . args)
        (format (current-error-port)
                (G_ "guix git: missing sub-command~%")))
       ((or ("-h") ("--help"))
-       (show-help)
+       (leave-on-EPIPE (show-help))
        (exit 0))
       ((or ("-V") ("--version"))
        (show-version-and-exit "guix git"))
-- 
2.38.1

[bug#66499] [PATCH v2 14/39] scripts: graph: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/graph.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/graph.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm
index c075e0ec29..6740858d8b 100644
--- a/guix/scripts/graph.scm
+++ b/guix/scripts/graph.scm
@@ -510,7 +510,7 @@ (define %options
               %standard-build-options)
          (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 15/39] scripts: hash: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/hash.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/hash.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm
index 6dc67a2416..7197d3965c 100644
--- a/guix/scripts/hash.scm
+++ b/guix/scripts/hash.scm
@@ -153,7 +153,7 @@ (define %options
                               (alist-delete 'serializer result))))
         (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 16/39] scripts: home: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/home.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/home.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm
index e0800bc062..b4c82d275f 100644
--- a/guix/scripts/home.scm
+++ b/guix/scripts/home.scm
@@ -164,7 +164,7 @@ (define %options
   ;; Specification of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\n "dry-run") #f #f
                  (lambda (opt name arg result)
-- 
2.38.1

[bug#66499] [PATCH v2 17/39] scripts: import: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/import.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/import.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm
index 4ddd8d46a1..1e8ffd25ec 100644
--- a/guix/scripts/import.scm
+++ b/guix/scripts/import.scm
@@ -78,7 +78,7 @@ (define-command (guix-import . args)
      (format (current-error-port)
              (G_ "guix import: missing importer name~%")))
     ((or ("-h") ("--help"))
-     (show-help)
+     (leave-on-EPIPE (show-help))
      (exit 0))
     ((or ("-V") ("--version"))
      (show-version-and-exit "guix import"))
-- 
2.38.1

[bug#66499] [PATCH v2 18/39] scripts: install: Handle EPIPE errors when displaying help.

[Simon Tournier via Guix-patches]

* guix/scripts/install.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/install.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/install.scm b/guix/scripts/install.scm
index 63e625f266..504dbc9a6f 100644
--- a/guix/scripts/install.scm
+++ b/guix/scripts/install.scm
@@ -52,7 +52,7 @@ (define %options
   ;; Specification of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 19/39] scripts: lint: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/lint.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/lint.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 9920c3ee62..ee3de51fb1 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -159,7 +159,7 @@ (define %options
               %standard-build-options)
         (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\l "list-checkers") #f #f
                 (lambda (opt name arg result)
-- 
2.38.1

[bug#66499] [PATCH v2 20/39] scripts: locate: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/locate.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/locate.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/locate.scm b/guix/scripts/locate.scm
index 79af533fd9..5f3e28797f 100644
--- a/guix/scripts/locate.scm
+++ b/guix/scripts/locate.scm
@@ -543,7 +543,7 @@ (define (show-help)
 
 (define %options
   (list (option '(#\h "help") #f #f
-                (lambda args (show-help) (exit 0)))
+                (lambda args (leave-on-EPIPE (show-help)) (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda (opt name arg result)
                   (show-version-and-exit "guix locate")))
-- 
2.38.1

[bug#66499] [PATCH v2 21/39] scripts: offload: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/offload.scm (guix-offload): Handle EPIPE errors when displaying
help.
---
 guix/scripts/offload.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index 7b76126d35..137e3b5fe3 100644
--- a/guix/scripts/offload.scm
+++ b/guix/scripts/offload.scm
@@ -868,11 +868,12 @@ (define-command (guix-offload . args)
     (("--version")
      (show-version-and-exit "guix offload"))
     (("--help")
-     (format #t (G_ "Usage: guix offload SYSTEM MAX-SILENT-TIME \
+     (leave-on-EPIPE
+      (format #t (G_ "Usage: guix offload SYSTEM MAX-SILENT-TIME \
 PRINT-BUILD-TRACE? BUILD-TIMEOUT
 Process build offload requests written on the standard input, possibly
 offloading builds to the machines listed in '~a'.~%")
-             %machine-file)
+              %machine-file))
      (display (G_ "
 This tool is meant to be used internally by 'guix-daemon'.\n"))
      (show-bug-report-information))
-- 
2.38.1

[bug#66499] [PATCH v2 22/39] scripts: pack: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/pack.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/pack.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 78044fd625..bdbea49910 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -1360,7 +1360,7 @@ (define %options
   ;; Specifications of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 23/39] scripts: package: Handle EPIPE errors when displaying help.

[Simon Tournier]

Reported by Mathieu Othacehe <othacehe@gnu.org>.

* guix/scripts/package.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/package.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index ab1968b62d..a489e06e73 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -504,7 +504,7 @@ (define %options
   ;; Specification of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 24/39] scripts: processes: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/processes.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/processes.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/processes.scm b/guix/scripts/processes.scm
index 3db5603286..4a855c8c7c 100644
--- a/guix/scripts/processes.scm
+++ b/guix/scripts/processes.scm
@@ -313,7 +313,7 @@ (define (show-help)
 (define %options
   (list (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 25/39] scripts: publish: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/publish.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/publish.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index ada81838ac..4457be1fce 100644
--- a/guix/scripts/publish.scm
+++ b/guix/scripts/publish.scm
@@ -160,7 +160,7 @@ (define (low-compression c)
 (define %options
   (list (option '(#\h "help") #f #f
                 (lambda _
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda _
-- 
2.38.1

[bug#66499] [PATCH v2 26/39] scripts: pull: Handle EPIPE errors when displaying help.

[Simon Tournier]

Reported by Mathieu Othacehe <othacehe@gnu.org>.

* guix/scripts/pull.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/pull.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 1904a6913a..58d3cd7e83 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -201,7 +201,7 @@ (define %options
 
          (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 27/39] scripts: refresh: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/refresh.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/refresh.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 46bf310d5f..d858ed07cb 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -144,7 +144,7 @@ (define %options
 
         (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 28/39] scripts: remove: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/remove.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/remove.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/remove.scm b/guix/scripts/remove.scm
index a46ad04d56..be073878c5 100644
--- a/guix/scripts/remove.scm
+++ b/guix/scripts/remove.scm
@@ -49,7 +49,7 @@ (define %options
   ;; Specification of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 29/39] scripts: repl: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/repl.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/repl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm
index fd23a2b982..cb71e59b05 100644
--- a/guix/scripts/repl.scm
+++ b/guix/scripts/repl.scm
@@ -42,7 +42,7 @@ (define %default-options
 (define %options
   (list (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 30/39] scripts: search: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/search.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/search.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/search.scm b/guix/scripts/search.scm
index 307ea410b9..e6deb710b1 100644
--- a/guix/scripts/search.scm
+++ b/guix/scripts/search.scm
@@ -47,7 +47,7 @@ (define %options
   ;; Specification of the command-line options.
   (list (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 31/39] scripts: shell: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/shell.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/shell.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm
index 898c355316..10ea110fee 100644
--- a/guix/scripts/shell.scm
+++ b/guix/scripts/shell.scm
@@ -116,7 +116,7 @@ (define %options
     (append
         (list (option '(#\h "help") #f #f
                       (lambda args
-                        (show-help)
+                        (leave-on-EPIPE (show-help))
                         (exit 0)))
               (option '(#\V "version") #f #f
                       (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 32/39] scripts: show: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/show.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/show.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/show.scm b/guix/scripts/show.scm
index f6d8256951..14b72cb75a 100644
--- a/guix/scripts/show.scm
+++ b/guix/scripts/show.scm
@@ -46,7 +46,7 @@ (define %options
   ;; Specification of the command-line options.
   (list (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 33/39] scripts: size: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/size.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/size.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm
index 48b8ecc881..d26ed98388 100644
--- a/guix/scripts/size.scm
+++ b/guix/scripts/size.scm
@@ -278,7 +278,7 @@ (define %options
               %standard-build-options)
         (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 34/39] scripts: style: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/style.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/style.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 4920a8d969..145cd09881 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -547,7 +547,7 @@ (define %options
 
         (option '(#\h "help") #f #f
                 (lambda args
-                  (show-help)
+                  (leave-on-EPIPE (show-help))
                   (exit 0)))
         (option '(#\l "list-stylings") #f #f
                 (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 35/39] scripts: system: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/system.scm (%options): Handle EPIPE errors when displaying help.
---
 guix/scripts/system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 547387d5e1..f85b663d64 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -1064,7 +1064,7 @@ (define %options
   ;; Specifications of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 36/39] scripts: substitute: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/substitute.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/substitute.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 8b1f7d6fda..126f0f9c69 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -813,7 +813,7 @@ (define-command (guix-substitute . args)
     ((or ("-V") ("--version"))
      (show-version-and-exit "guix substitute"))
     ((or ("-h") ("--help") ())
-     (show-help)
+     (leave-on-EPIPE (show-help))
      (exit 0))
     (_ #t))
 
-- 
2.38.1

[bug#66499] [PATCH v2 37/39] scripts: time-machine: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/time-machine.scm (%options): Handle EPIPE errors when
displaying help.
---
 guix/scripts/time-machine.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm
index 3ecf735acb..f31fae7435 100644
--- a/guix/scripts/time-machine.scm
+++ b/guix/scripts/time-machine.scm
@@ -107,7 +107,7 @@ (define %options
                    (alist-cons 'authenticate-channels? #f result)))
          (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 38/39] scripts: upgrade: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/upgrade.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/upgrade.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/upgrade.scm b/guix/scripts/upgrade.scm
index beb59cbe6f..1a5e8088cb 100644
--- a/guix/scripts/upgrade.scm
+++ b/guix/scripts/upgrade.scm
@@ -56,7 +56,7 @@ (define %options
   ;; Specification of the command-line options.
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH v2 39/39] scripts: weather: Handle EPIPE errors when displaying help.

[Simon Tournier]

* guix/scripts/weather.scm (%options): Handle EPIPE errors when displaying
help.
---
 guix/scripts/weather.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm
index dc27f81984..140df3435f 100644
--- a/guix/scripts/weather.scm
+++ b/guix/scripts/weather.scm
@@ -360,7 +360,7 @@ (define (show-help)
 (define %options
   (cons* (option '(#\h "help") #f #f
                  (lambda args
-                   (show-help)
+                   (leave-on-EPIPE (show-help))
                    (exit 0)))
          (option '(#\V "version") #f #f
                  (lambda args
-- 
2.38.1

[bug#66499] [PATCH] ui: Handle EPIPE errors when displaying Guix version.

[Mathieu Othacehe]

Hello,

> Well, I do not think we can do really better than add leave-on-EPIPE
> here or there.

Thanks for taking care of that :).

It looks OK to me.

Mathieu

bug#66499: [PATCH] ui: Handle EPIPE errors when displaying Guix version.

[Simon Tournier]

Hi,

On Tue, 17 Oct 2023 at 11:48, Mathieu Othacehe <othacehe@gnu.org> wrote:

> It looks OK to me.

Thanks.  Pushed and closing.

Cheers,
simon