From b4d1eb53c01d3b6e7b255debb593d5c7de725977 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Thu, 12 Oct 2023 15:39:03 +0200 Subject: [PATCH] ui: Handle EPIPE errors when displaying Guix version. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Clément Lassieur . * 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 @@ See the \"Application Setup\" section in the manual, for more info.\n")) (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 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)