summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-06-25 11:26:22 +0200
committerLudovic Courtès <ludo@gnu.org>2021-06-25 15:12:05 +0200
commit1b4931555b3e876a313ce31273984f3a59b2ec78 (patch)
tree81c1b8e385834dec61dc8858bc35cb087865597c /guix
parent9931d2779fe9db12d8477a850ad901105c484437 (diff)
downloadguix-patches-1b4931555b3e876a313ce31273984f3a59b2ec78.tar
guix-patches-1b4931555b3e876a313ce31273984f3a59b2ec78.tar.gz
deploy: Leave on hard error.
Previously, the error message would be displayed, followed by a backtrace ending in &non-continuable. * guix/scripts/deploy.scm (deploy-machine*): Call 'leave' rather than 'report-error' when C is a &message.
Diffstat (limited to 'guix')
-rw-r--r--guix/scripts/deploy.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
index 7c62b05d12..8bb8a7932e 100644
--- a/guix/scripts/deploy.scm
+++ b/guix/scripts/deploy.scm
@@ -129,9 +129,9 @@ Perform the deployment specified by FILE.\n"))
(raise c))
((message-condition? c)
- (report-error (G_ "failed to deploy ~a: ~a~%")
- (machine-display-name machine)
- (condition-message c)))
+ (leave (G_ "failed to deploy ~a: ~a~%")
+ (machine-display-name machine)
+ (condition-message c)))
((deploy-error? c)
(when (deploy-error-should-roll-back c)
(info (G_ "rolling back ~a...~%")