From 24d17bf6cfc46bf36c499c883bdf4d726446548e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 21 Dec 2020 09:53:42 +0000 Subject: Handle canceled builds in the default-build-missing-inputs-hook --- guix-build-coordinator/hooks.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'guix-build-coordinator/hooks.scm') diff --git a/guix-build-coordinator/hooks.scm b/guix-build-coordinator/hooks.scm index f5abe6c..7673ec3 100644 --- a/guix-build-coordinator/hooks.scm +++ b/guix-build-coordinator/hooks.scm @@ -360,10 +360,21 @@ (assq-ref build 'derivation-name) missing-input))) (if input-derivation - (let ((builds-for-output - (datastore-list-builds-for-output datastore - missing-input))) - (if (null? builds-for-output) + (let* ((builds-for-output + (datastore-list-builds-for-output datastore + missing-input)) + (processed-builds + (filter (lambda (build-details) + (assq-ref build-details 'processed)) + builds-for-output)) + (pending-builds + (filter (lambda (build-details) + (and + (not (assq-ref build-details 'processed)) + (not (assq-ref build-details 'canceled)))) + builds-for-output))) + (if (or (null? processed-builds) + (null? pending-builds)) (begin (simple-format #t "submitting build for ~A\n" -- cgit v1.2.3