From 05124a17e1f66bb35679e88f596a70f359c93a18 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 16 Nov 2020 19:35:36 +0000 Subject: Improve error reporting when a derivation can't be substituted This avoids errors converting #f to a list. --- guix-build-coordinator/client-communication.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix-build-coordinator/client-communication.scm b/guix-build-coordinator/client-communication.scm index ec748b1..797af73 100644 --- a/guix-build-coordinator/client-communication.scm +++ b/guix-build-coordinator/client-communication.scm @@ -174,10 +174,12 @@ (call-with-worker-thread substitutes-channel (lambda () - (substitute-derivation derivation-file - #:substitute-urls - (vector->list - (assoc-ref body "substitute-urls")))))) + (let ((raw-substitute-urls + (assoc-ref body "substitute-urls"))) + (substitute-derivation derivation-file + #:substitute-urls + (and=> raw-substitute-urls + vector->list)))))) (datastore-store-derivation datastore (read-derivation-from-file derivation-file)))) -- cgit v1.2.3