diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-12-19 09:31:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-12-22 15:10:52 +0100 |
| commit | 5d6dfd8981ac9ab65012de0e9a9ed26301e5b8fd (patch) | |
| tree | 0dd35f8a93688c724dad50d048fdd49e50a98216 | |
| parent | ce279acd14fba2dfca17a25d7733838df9103dcb (diff) | |
authenticate: Improve error replies.
* guix/scripts/authenticate.scm (guix-authenticate)[send-reply]: Wrap guard in
‘with-fluids’. Call ‘string-trim-right’ on the message string of ‘c’.
Change-Id: I6ab5f645f2dc9d6f53bb57eabb4de1df8212892f
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | guix/scripts/authenticate.scm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/guix/scripts/authenticate.scm b/guix/scripts/authenticate.scm index 45f62f6ebc2..48e76c61c8a 100644 --- a/guix/scripts/authenticate.scm +++ b/guix/scripts/authenticate.scm @@ -161,10 +161,14 @@ by colon, followed by the given number of characters." ;; Send a reply for the result of THUNK or for any exception raised during ;; its execution. (guard (c ((formatted-message? c) - (send-reply (reply-code command-failed) - (apply format #f - (G_ (formatted-message-string c)) - (formatted-message-arguments c))))) + ;; Make sure the translated message can be written to standard + ;; output as ISO-8859-1 no matter what (XXX). + (with-fluids ((%default-port-conversion-strategy 'substitute)) + (send-reply (reply-code command-failed) + (apply format #f + (string-trim-right + (G_ (formatted-message-string c))) + (formatted-message-arguments c)))))) (send-reply (reply-code success) (thunk)))) (define-syntax-rule (with-reply exp ...) |