aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-07-25 18:26:18 +0200
committerLudovic Courtès <ludo@gnu.org>2020-07-25 19:11:37 +0200
commitd51bfe242fbe6f3f8f71d723e8fe0c7bbe711ba1 (patch)
tree6d8519ba2ab3e5475ff44dfa3a1c2aa9ec8a50b9 /gnu/packages.scm
parent252a1926bc7d7aa0b39d89a484c0c1b82e945fcd (diff)
downloadguix-d51bfe242fbe6f3f8f71d723e8fe0c7bbe711ba1.tar
guix-d51bfe242fbe6f3f8f71d723e8fe0c7bbe711ba1.tar.gz
Use 'formatted-message' instead of '&message' where appropriate.
* gnu.scm (%try-use-modules): Use 'formatted-message' instead of '&message'. * gnu/machine/digital-ocean.scm (maybe-raise-unsupported-configuration-error): Likewise. * gnu/machine/ssh.scm (machine-check-file-system-availability): Likewise. (machine-check-building-for-appropriate-system): Likewise. (deploy-managed-host): Likewise. (maybe-raise-unsupported-configuration-error): Likewise. * gnu/packages.scm (search-patch): Likewise. * gnu/services.scm (%service-with-default-value): Likewise. (files->etc-directory): Likewise. (fold-services): Likewise. * gnu/system.scm (locale-name->definition*): Likewise. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Likewise. (check-luks-device): Likewise. * guix/channels.scm (latest-channel-instance): Likewise. * guix/cve.scm (json->cve-items): Likewise. * guix/git-authenticate.scm (commit-signing-key): Likewise. (commit-authorized-keys): Likewise. (authenticate-commit): Likewise. (verify-introductory-commit): Likewise. * guix/remote.scm (remote-pipe-for-gexp): Likewise. * guix/scripts/graph.scm (assert-package): Likewise. * guix/scripts/offload.scm (private-key-from-file*): Likewise. * guix/ssh.scm (authenticate-server*): Likewise. (open-ssh-session): Likewise. (remote-inferior): Likewise. * guix/ui.scm (matching-generations): Likewise. * guix/upstream.scm (package-update): Likewise. * tests/channels.scm ("latest-channel-instances, missing introduction for 'guix'"): Catch 'formatted-message?'. ("authenticate-channel, wrong first commit signer"): Likewise. * tests/lint.scm ("patches: not found"): Adjust message string. * tests/packages.scm ("patch not found yields a run-time error"): Catch 'formatted-message?'. * guix/lint.scm (check-patch-file-names): Handle 'formatted-message?'. (check-derivation): Ditto.
Diffstat (limited to 'gnu/packages.scm')
-rw-r--r--gnu/packages.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm
index d22c992bb1..4e4282645a 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -24,6 +24,7 @@
#:use-module (guix packages)
#:use-module (guix ui)
#:use-module (guix utils)
+ #:use-module (guix diagnostics)
#:use-module (guix discovery)
#:use-module (guix memoization)
#:use-module ((guix build utils)
@@ -92,9 +93,8 @@
(define (search-patch file-name)
"Search the patch FILE-NAME. Raise an error if not found."
(or (search-path (%patch-path) file-name)
- (raise (condition
- (&message (message (format #f (G_ "~a: patch not found")
- file-name)))))))
+ (raise (formatted-message (G_ "~a: patch not found")
+ file-name))))
(define-syntax-rule (search-patches file-name ...)
"Return the list of absolute file names corresponding to each