summaryrefslogtreecommitdiff
path: root/gnu/machine
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/machine
parent252a1926bc7d7aa0b39d89a484c0c1b82e945fcd (diff)
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/machine')
-rw-r--r--gnu/machine/digital-ocean.scm7
-rw-r--r--gnu/machine/ssh.scm36
2 files changed, 15 insertions, 28 deletions
diff --git a/gnu/machine/digital-ocean.scm b/gnu/machine/digital-ocean.scm
index 1a91a3a49b..82383a8c7c 100644
--- a/gnu/machine/digital-ocean.scm
+++ b/gnu/machine/digital-ocean.scm
@@ -26,6 +26,7 @@
#:use-module (guix base32)
#:use-module (guix derivations)
#:use-module (guix i18n)
+ #:use-module ((guix diagnostics) #:select (formatted-message))
#:use-module (guix import json)
#:use-module (guix monads)
#:use-module (guix records)
@@ -414,9 +415,7 @@ one procured from https://cloud.digitalocean.com/account/api/tokens.")))))))
(let ((config (machine-configuration machine))
(environment (environment-type-name (machine-environment machine))))
(unless (and config (digital-ocean-configuration? config))
- (raise (condition
- (&message
- (message (format #f (G_ "unsupported machine configuration '~a'
+ (raise (formatted-message (G_ "unsupported machine configuration '~a' \
for environment of type '~a'")
config
- environment))))))))
+ environment)))))
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 4148639292..641e871861 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -179,11 +179,9 @@ exist on the machine."
(lambda args
(system-error-errno args)))))
(when (number? errno)
- (raise (condition
- (&message
- (message (format #f (G_ "device '~a' not found: ~a")
+ (raise (formatted-message (G_ "device '~a' not found: ~a")
(file-system-device fs)
- (strerror errno)))))))))
+ (strerror errno))))))
(define (check-labeled-file-system fs)
(define remote-exp
@@ -196,11 +194,9 @@ exist on the machine."
(remote-let ((result remote-exp))
(unless result
- (raise (condition
- (&message
- (message (format #f (G_ "no file system with label '~a'")
+ (raise (formatted-message (G_ "no file system with label '~a'")
(file-system-label->string
- (file-system-device fs))))))))))
+ (file-system-device fs)))))))
(define (check-uuid-file-system fs)
(define remote-exp
@@ -217,10 +213,8 @@ exist on the machine."
(remote-let ((result remote-exp))
(unless result
- (raise (condition
- (&message
- (message (format #f (G_ "no file system with UUID '~a'")
- (uuid->string (file-system-device fs))))))))))
+ (raise (formatted-message (G_ "no file system with UUID '~a'")
+ (uuid->string (file-system-device fs)))))))
(append (map check-literal-file-system
(filter (lambda (fs)
@@ -285,12 +279,10 @@ by MACHINE."
(system (remote-system (machine-ssh-session machine))))
(when (and (machine-ssh-configuration-build-locally? config)
(not (string= system (machine-ssh-configuration-system config))))
- (raise (condition
- (&message
- (message (format #f (G_ "incorrect target system\
+ (raise (formatted-message (G_ "incorrect target system\
('~a' was given, while the system reports that it is '~a')~%")
(machine-ssh-configuration-system config)
- system))))))))
+ system)))))
(define (check-deployment-sanity machine)
"Raise a '&message' error condition if it is clear that deploying MACHINE's
@@ -402,11 +394,9 @@ environment type of 'managed-host."
(when (machine-ssh-configuration-authorize?
(machine-configuration machine))
(unless (file-exists? %public-key-file)
- (raise (condition
- (&message
- (message (format #f (G_ "no signing key '~a'. \
+ (raise (formatted-message (G_ "no signing key '~a'. \
have you run 'guix archive --generate-key?'")
- %public-key-file))))))
+ %public-key-file)))
(remote-authorize-signing-key (call-with-input-file %public-key-file
(lambda (port)
(string->canonical-sexp
@@ -497,9 +487,7 @@ connection to the host.")))
(let ((config (machine-configuration machine))
(environment (environment-type-name (machine-environment machine))))
(unless (and config (machine-ssh-configuration? config))
- (raise (condition
- (&message
- (message (format #f (G_ "unsupported machine configuration '~a'
+ (raise (formatted-message (G_ "unsupported machine configuration '~a'
for environment of type '~a'")
config
- environment))))))))
+ environment)))))