aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2020-11-16 19:35:36 +0000
committerChristopher Baines <mail@cbaines.net>2020-11-16 19:35:36 +0000
commit05124a17e1f66bb35679e88f596a70f359c93a18 (patch)
tree00de0a3fb5c98e0155d85713824850068ac610b7
parent4b8279d1f4d2b0e09a7a9531a7a7d8c7dc7d8753 (diff)
downloadbuild-coordinator-05124a17e1f66bb35679e88f596a70f359c93a18.tar
build-coordinator-05124a17e1f66bb35679e88f596a70f359c93a18.tar.gz
Improve error reporting when a derivation can't be substituted
This avoids errors converting #f to a list.
-rw-r--r--guix-build-coordinator/client-communication.scm10
1 files 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))))