[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Ludovic Courtès |
Date: |
Wed, 25 Oct 2023 18:01:46 -0400 (EDT) |
branch: master
commit 4cc37f540c8f3967bbed7b8877e2cd49d9dcae14
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Oct 25 18:27:08 2023 +0200
remote-worker: Ignore the return value of ‘build-derivations&’.
* src/cuirass/scripts/remote-worker.scm (run-build): Ignore the return
value of ‘build-derivations&’ since it’s always #t.
---
src/cuirass/scripts/remote-worker.scm | 39 ++++++++++++++---------------------
1 file changed, 16 insertions(+), 23 deletions(-)
diff --git a/src/cuirass/scripts/remote-worker.scm
b/src/cuirass/scripts/remote-worker.scm
index b6c2088..2c9f569 100644
--- a/src/cuirass/scripts/remote-worker.scm
+++ b/src/cuirass/scripts/remote-worker.scm
@@ -234,29 +234,22 @@ still be substituted."
(log-info (G_ "~a: derivation `~a' build failed: ~a")
name drv (store-protocol-error-message c))
(reply (build-failed-message drv local-publish-url))))
- (let ((result
- (let-values (((port finish)
- (build-derivations& store (list drv))))
- (catch 'system-error
- (lambda ()
- (send-log address log-port drv port))
- (lambda args
- (log-error (G_ "could not send logs to ~a:~a")
- address log-port)
- (dump-port port (%make-void-port "w"))))
- (close-port port)
- (finish))))
- (if result
- (begin
- (log-info (G_ "~a: derivation ~a build succeeded.")
- name drv)
- (register-gc-roots drv)
- (reply (build-succeeded-message drv local-publish-url)))
- (begin
- (log-info (G_ "~a: derivation ~a build failed.")
- name drv)
- (reply
- (build-failed-message drv local-publish-url)))))))))
+ (let-values (((port finish)
+ (build-derivations& store (list drv))))
+ (catch 'system-error
+ (lambda ()
+ (send-log address log-port drv port))
+ (lambda args
+ (log-error (G_ "could not send logs to ~a:~a")
+ address log-port)
+ (dump-port port (%make-void-port "w"))))
+ (close-port port)
+ (finish)
+
+ (log-info (G_ "~a: derivation ~a build succeeded.")
+ name drv)
+ (register-gc-roots drv)
+ (reply (build-succeeded-message drv local-publish-url)))))))
(define* (run-command command server
#:key
- master updated (966505d -> 0a9776e), Ludovic Courtès, 2023/10/25
- [no subject], Ludovic Courtès, 2023/10/25
- [no subject], Ludovic Courtès, 2023/10/25
- [no subject], Ludovic Courtès, 2023/10/25
- [no subject], Ludovic Courtès, 2023/10/25
- [no subject], Ludovic Courtès, 2023/10/25
- [no subject], Ludovic Courtès, 2023/10/25
- [no subject],
Ludovic Courtès <=
- [no subject], Ludovic Courtès, 2023/10/25
- [no subject], Ludovic Courtès, 2023/10/25