From 4c98d199ee28cf5e81f05f13b20d0ae3ebca7f57 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 7 Apr 2025 14:53:04 +0100 Subject: Don't get stuck trying to cancel already canceled builds --- guix-qa-frontpage/manage-builds.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm index 90e7798..37cf8fb 100644 --- a/guix-qa-frontpage/manage-builds.scm +++ b/guix-qa-frontpage/manage-builds.scm @@ -613,17 +613,19 @@ #:ignore-if-build-required-by-another? (if (eq? relationship 'unset) #f - #t))) + #t)) + (simple-format (current-error-port) + "canceled ~A\n" uuid)) #:times 6 #:delay 15 #:ignore (lambda (exn) ;; TODO Improve the coordinator exceptions (and (exception-with-message? exn) - (string=? - (assoc-ref (exception-message exn) "error") - "build-already-processed")))) - (simple-format (current-error-port) - "canceled ~A\n" uuid)) + (let ((err + (assoc-ref (exception-message exn) "error"))) + (or + (string=? err "build-already-processed") + (string=? err "build-already-canceled"))))))) builds-to-cancel) (unless (null? builds-to-cancel) -- cgit v1.2.3