diff mbox series

[bug#57900] : scripts: build: Format strings before calling display-hint.

Message ID 86y1uhuwqp.fsf@163.com
State Accepted
Headers show
Series [bug#57900] : scripts: build: Format strings before calling display-hint. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Zhu Zihao Sept. 18, 2022, 4:31 a.m. UTC 
Hi guix.

when running following command, the error message is not expected.

```
citreu@asus-laptop:~$ guix build hello --target=foobar
guix build: error: 'foobar' is not a supported cross-compilation target
hint: Try `--list-targets' to view available targets.~%

citreu@asus-laptop:~$ guix build hello --system=foobar
guix build: error: 'foobar' is not a supported system
hint: Try `--list-systems' to view available system types.~%
```

Unexpected ~% at the end of message.

In guix/scripts/build.scm, the code use display-hint to show this hint
but it doesn't format the "~%" to newline.

This patch adds these missing formats

Comments

Mathieu Othacehe Sept. 30, 2022, 1:53 p.m. UTC | #1 
> * guix/scripts/build.scm(%standard-cross-build-options): format hint string.
> %standard-cross-build-options: Ditto.

Applied, thanks!

Mathieu
diff mbox series

Patch

From 13b4f55dc1f21a8ca15329d493f441d09df0ab4e Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sun, 18 Sep 2022 12:28:09 +0800
Subject: [PATCH] scripts: build: Format strings before calling display-hint.

* guix/scripts/build.scm(%standard-cross-build-options): format hint string.
%standard-cross-build-options: Ditto.
---
 guix/scripts/build.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 06d9ad1f0c..0787dfcc9a 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -383,8 +383,9 @@  (define %standard-cross-build-options
                           (format #f (G_ "Did you mean @code{~a}?
 Try @option{--list-targets} to view available targets.~%")
                                   closest))
-                         (display-hint (G_ "\
-Try @option{--list-targets} to view available targets.~%")))
+                         (display-hint
+                          (format #f (G_ "\
+Try @option{--list-targets} to view available targets.~%"))))
                      (exit 1))))))))
 
 (define %standard-native-build-options
@@ -409,8 +410,9 @@  (define %standard-native-build-options
                           (format #f (G_ "Did you mean @code{~a}?
 Try @option{--list-systems} to view available system types.~%")
                                   closest))
-                         (display-hint (G_ "\
-Try @option{--list-systems} to view available system types.~%")))
+                         (display-hint
+                          (format #f (G_ "\
+Try @option{--list-systems} to view available system types.~%"))))
                      (exit 1))))))))
 
 
-- 
2.37.3