[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#40130] [PATCH 5/8] deploy: Use 'with-build-handler'.
From: |
Ludovic Courtès |
Subject: |
[bug#40130] [PATCH 5/8] deploy: Use 'with-build-handler'. |
Date: |
Thu, 19 Mar 2020 12:02:49 +0100 |
Until now, 'guix deploy' would never display what is going to be built.
* guix/scripts/deploy.scm (guix-deploy): Wrap 'for-each' in
'with-build-handler'.
---
guix/scripts/deploy.scm | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
index ad05c333dc..a82dde00a4 100644
--- a/guix/scripts/deploy.scm
+++ b/guix/scripts/deploy.scm
@@ -108,19 +108,21 @@ Perform the deployment specified by FILE.\n"))
(with-status-verbosity (assoc-ref opts 'verbosity)
(with-store store
(set-build-options-from-command-line store opts)
- (for-each (lambda (machine)
- (info (G_ "deploying to ~a...~%")
- (machine-display-name machine))
- (parameterize ((%graft? (assq-ref opts 'graft?)))
- (guard (c ((message-condition? c)
- (report-error (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...~%")
- (machine-display-name machine))
- (run-with-store store (roll-back-machine
machine)))
- (apply throw (deploy-error-captured-args c))))
- (run-with-store store (deploy-machine machine)))))
- machines)))))
+ (with-build-handler (build-notifier #:use-substitutes?
+ (assoc-ref opts 'substitutes?))
+ (for-each (lambda (machine)
+ (info (G_ "deploying to ~a...~%")
+ (machine-display-name machine))
+ (parameterize ((%graft? (assq-ref opts 'graft?)))
+ (guard (c ((message-condition? c)
+ (report-error (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...~%")
+ (machine-display-name machine))
+ (run-with-store store (roll-back-machine
machine)))
+ (apply throw (deploy-error-captured-args
c))))
+ (run-with-store store (deploy-machine machine)))))
+ machines))))))
--
2.25.1
- [bug#40130] [PATCH 0/8] Add 'with-build-handler' and use it to improve UI feedback, Ludovic Courtès, 2020/03/19
- [bug#40130] [PATCH 1/8] syscalls: 'with-file-lock' re-grabs lock when reentering its dynamic extent., Ludovic Courtès, 2020/03/19
- [bug#40130] [PATCH 3/8] ui: Add a notification build handler., Ludovic Courtès, 2020/03/19
- [bug#40130] [PATCH 4/8] guix build: Use 'with-build-handler'., Ludovic Courtès, 2020/03/19
- [bug#40130] [PATCH 2/8] store: Add 'with-build-handler'., Ludovic Courtès, 2020/03/19
- [bug#40130] [PATCH 5/8] deploy: Use 'with-build-handler'.,
Ludovic Courtès <=
- [bug#40130] [PATCH 8/8] guix system: Use 'with-build-handler'., Ludovic Courtès, 2020/03/19
- [bug#40130] [PATCH 6/8] pack: Use 'with-build-handler'., Ludovic Courtès, 2020/03/19
- [bug#40130] [PATCH 7/8] guix package, pull: Use 'with-build-handler'., Ludovic Courtès, 2020/03/19
- bug#40130: [PATCH 0/8] Add 'with-build-handler' and use it to improve UI feedback, Ludovic Courtès, 2020/03/22