aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2025-04-07 14:53:04 +0100
committerChristopher Baines <mail@cbaines.net>2025-04-07 14:53:04 +0100
commit4c98d199ee28cf5e81f05f13b20d0ae3ebca7f57 (patch)
tree6f706fdcf7b8259066e4219f936ff41963266668
parentec853656e9f1f5a9d5a73ebdf016dc320da075af (diff)
downloadqa-frontpage-4c98d199ee28cf5e81f05f13b20d0ae3ebca7f57.tar
qa-frontpage-4c98d199ee28cf5e81f05f13b20d0ae3ebca7f57.tar.gz
Don't get stuck trying to cancel already canceled builds
-rw-r--r--guix-qa-frontpage/manage-builds.scm14
1 files 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)