From 2b8d612f4ea8d0a681c7865a84c190533de3d2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 23 Nov 2024 16:01:44 +0100 Subject: [PATCH] =?UTF-8?q?ui:=20=E2=80=98display-hint=E2=80=99=20checks?= =?UTF-8?q?=20column=20number=20for=20the=20right=20port.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes (rather: works around) something like: $ guix import pypi nipype -r >/dev/null […] hint: Backtrace: […] 344:42 3 (display-hint "This indicates that the\npackage is a…" . #) In ice-9/boot-9.scm: 1747:15 2 (with-exception-handler # …) In guix/build/syscalls.scm: 2334:35 1 (_) 2323:8 0 (terminal-window-size _) guix/build/syscalls.scm:2323:8: In procedure terminal-window-size: In procedure terminal-window-size: Inappropriate ioctl for device * guix/ui.scm (display-hint): Pass PORT to ‘terminal-columns’. Change-Id: Ica0096aee5e6b2c19814ae5d71de9ffe9ab32430 --- guix/ui.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/ui.scm b/guix/ui.scm index 447550635c2..eba12c86163 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -341,7 +341,7 @@ other objects that must match the 'format' escapes in MESSAGE." (display (colorize (G_ "hint: ")) port) (display ;; XXX: We should arrange so that the initial indent is wider. - (parameterize ((%text-width (max 15 (- (terminal-columns) 5)))) + (parameterize ((%text-width (max 15 (- (terminal-columns port) 5)))) (texi->plain-text (match arguments (() (format #f message)) (_ (apply format #f message