diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-11-16 19:35:24 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-11-16 19:35:24 +0000 |
| commit | 4b8279d1f4d2b0e09a7a9531a7a7d8c7dc7d8753 (patch) | |
| tree | d30b1add2c2e413b222c17a6bbb334429fbfb206 | |
| parent | ec8080580c0f08e0e3563d99e17b5a81797c48b2 (diff) | |
| download | build-coordinator-4b8279d1f4d2b0e09a7a9531a7a7d8c7dc7d8753.tar build-coordinator-4b8279d1f4d2b0e09a7a9531a7a7d8c7dc7d8753.tar.gz | |
Avoid agent crashes when substitute urls aren't provided
| -rw-r--r-- | guix-build-coordinator/agent.scm | 22 | ||||
| -rw-r--r-- | guix-build-coordinator/utils.scm | 12 |
2 files changed, 23 insertions, 11 deletions
diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm index 96611fc..582b607 100644 --- a/guix-build-coordinator/agent.scm +++ b/guix-build-coordinator/agent.scm @@ -143,13 +143,20 @@ output-paths)) (path-substitutes (begin - (set-build-options store #:substitute-urls - non-derivation-substitute-urls) + (when non-derivation-substitute-urls + (set-build-options store #:substitute-urls + non-derivation-substitute-urls)) + + (unless non-derivation-substitute-urls + (simple-format + #t + "warning: unable to query substitute servers without caching\n")) (map (lambda (file) (and - (has-substiutes-no-cache? non-derivation-substitute-urls - file) + (and (list? non-derivation-substitute-urls) + (has-substiutes-no-cache? non-derivation-substitute-urls + file)) (if (has-substitutes? store file) #t (begin @@ -177,9 +184,10 @@ (make-exception-with-message "timeout fetching inputs")) (begin ;; Download the substitutes - (set-build-options store - #:substitute-urls - non-derivation-substitute-urls) + (when non-derivation-substitute-urls + (set-build-options store + #:substitute-urls + non-derivation-substitute-urls)) (build-things store missing-paths)))) #:times 6 diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm index 0dd1473..a0f13ad 100644 --- a/guix-build-coordinator/utils.scm +++ b/guix-build-coordinator/utils.scm @@ -324,10 +324,14 @@ upcoming chunk." (catch #t (lambda () (with-store store - (set-build-options store - #:print-extended-build-trace? #t - #:multiplexed-build-output? #t - #:substitute-urls substitute-urls) + (apply set-build-options + store + `(#:print-extended-build-trace? #t + #:multiplexed-build-output? #t + ,@(if substitute-urls + `(#:substitute-urls ,substitute-urls) + '()))) + (with-status-report (lambda (event status new) (print-build-event event status new) |