diff options
author | Ludovic Courtès <ludo@gnu.org> | 2023-02-24 11:15:45 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2023-02-27 23:40:43 +0100 |
commit | 43c36c5c9f7a31649eb059fd16ed82bde20da3fc (patch) | |
tree | 305f5793c75a118ef9a76d8229110ee104859f35 /guix/status.scm | |
parent | 92a0e60a963a54230e400c5c2ae585205489bf35 (diff) | |
download | guix-patches-43c36c5c9f7a31649eb059fd16ed82bde20da3fc.tar guix-patches-43c36c5c9f7a31649eb059fd16ed82bde20da3fc.tar.gz |
ui: 'display-hint' quotes extra arguments for Texinfo.
Fixes <https://issues.guix.gnu.org/61201>.
Previously, common practice was to splice arbitrary strings (user names,
file names, etc.) into Texinfo snippets passed to 'display-hint'. This
is unsafe in the general case because at signs and braces need to be
escaped to produced valid Texinfo. This commit addresses that.
* guix/ui.scm (texinfo-quote): New procedure.
(display-hint): When ARGUMENTS is non-empty, pass it to 'texinfo-quote'
and call 'format'.
(report-unbound-variable-error, check-module-matches-file)
(display-collision-resolution-hint, run-guix-command): Remove explicit
'format' call; pass 'format' arguments as extra arguments to 'display-hint'.
* gnu/services/monitoring.scm (zabbix-front-end-config): Likewise.
* guix/scripts.scm (warn-about-disk-space): Likewise.
* guix/scripts/build.scm (%standard-cross-build-options)
(%standard-native-build-options): Likewise.
* guix/scripts/describe.scm (display-checkout-info): Likewise.
* guix/scripts/environment.scm (suggest-command-name): Likewise.
* guix/scripts/home.scm (process-command): Likewise.
* guix/scripts/home/edit.scm (service-type-not-found): Likewise.
* guix/scripts/import.scm (guix-import): Likewise.
* guix/scripts/package.scm (display-search-path-hint): Likewise.
* guix/scripts/pull.scm (build-and-install): Likewise.
* guix/scripts/shell.scm (auto-detect-manifest): Likewise.
* guix/scripts/system.scm (check-file-system-availability): Likewise.
(guix-system): Likewise.
* guix/scripts/system/edit.scm (service-type-not-found): Likewise.
* guix/status.scm (print-build-event): Likewise.
Diffstat (limited to 'guix/status.scm')
-rw-r--r-- | guix/status.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/guix/status.scm b/guix/status.scm index 5580c80ea9..a192cd789a 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -533,15 +533,15 @@ substitutes being downloaded." (when (and (pair? properties) (eq? (assq-ref properties 'type) 'profile-hook) (eq? (assq-ref properties 'hook) 'package-cache)) - (display-hint (format #f (G_ "This usually indicates a bug in one of + (display-hint (G_ "This usually indicates a bug in one of the channels you are pulling from, or some incompatibility among them. You can check the build log and report the issue to the channel developers. The channels you are pulling from are: ~a.") - (string-join - (map symbol->string - (or (assq-ref properties 'channels) - '(guix)))))))) + (string-join + (map symbol->string + (or (assq-ref properties 'channels) + '(guix))))))) (match (derivation-log-file drv) (#f (format port (failure (G_ "Could not find build log for '~a'.")) |