From 356c0840fc501e23e8364d5254093cbe4ebec513 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 6 Jun 2024 09:27:29 +0100 Subject: Retry more when substituting derivations And don't use the no substitutes fallback. --- guix-build-coordinator/client-communication.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'guix-build-coordinator') diff --git a/guix-build-coordinator/client-communication.scm b/guix-build-coordinator/client-communication.scm index 46535e4..2ea7ce2 100644 --- a/guix-build-coordinator/client-communication.scm +++ b/guix-build-coordinator/client-communication.scm @@ -484,17 +484,15 @@ 'WARN "exception substituting derivation " derivation-file ": " exn) - - (if (null? (or substitute-urls '())) - ;; Try again - (read-drv/substitute derivation-file) - (read-derivation-through-substitutes - derivation-file - substitute-urls))) + (raise-exception exn)) (lambda () (with-throw-handler #t (lambda () - (read-drv/substitute derivation-file)) + (retry-on-error + (lambda () + (read-drv/substitute derivation-file)) + #:times 5 + #:delay 5)) (lambda args (backtrace)))) #:unwind? #t)) -- cgit v1.2.3