[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: deploy: Leave on hard error.
From: |
guix-commits |
Subject: |
03/06: deploy: Leave on hard error. |
Date: |
Fri, 25 Jun 2021 09:12:50 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 1b4931555b3e876a313ce31273984f3a59b2ec78
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jun 25 11:26:22 2021 +0200
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.
---
guix/scripts/deploy.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
index 7c62b05..8bb8a79 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...~%")
- branch master updated (88c7c73 -> 0a02abd), guix-commits, 2021/06/25
- 01/06: gnu: suitesparse: Link against OpenBLAS rather than LAPACK., guix-commits, 2021/06/25
- 02/06: gnu: suitesparse: Update to 5.10.1., guix-commits, 2021/06/25
- 03/06: deploy: Leave on hard error.,
guix-commits <=
- 04/06: reconfigure: Use 'formatted-message'., guix-commits, 2021/06/25
- 05/06: import: hackage: Support "common" field and imports, guix-commits, 2021/06/25
- 06/06: build: Build guix.scm and gnu.scm., guix-commits, 2021/06/25