diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-05-19 17:48:59 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-05-19 17:48:59 +0100 |
| commit | 6254450177def40f3d9b51265963ef606f9870ed (patch) | |
| tree | 19c3f230adea6d4d72c4b54fbed333a153f6eb84 | |
| parent | 870ba33917f942d51c3f1b6f74f8287af3bb9c9c (diff) | |
| download | build-coordinator-6254450177def40f3d9b51265963ef606f9870ed.tar build-coordinator-6254450177def40f3d9b51265963ef606f9870ed.tar.gz | |
Fix the build show missing inputs functionality
| -rw-r--r-- | guix-build-coordinator/client-communication.scm | 25 | ||||
| -rw-r--r-- | scripts/guix-build-coordinator.in | 8 |
2 files changed, 18 insertions, 15 deletions
diff --git a/guix-build-coordinator/client-communication.scm b/guix-build-coordinator/client-communication.scm index dba2203..2360631 100644 --- a/guix-build-coordinator/client-communication.scm +++ b/guix-build-coordinator/client-communication.scm @@ -108,18 +108,19 @@ ,@(if (string=? (assq-ref setup-failure 'failure-reason) "missing_inputs") `((missing-inputs - . ,(map - (lambda (missing-input) - (let ((builds-for-missing-input - (datastore-list-builds-for-output - datastore - missing-input))) - `(,@missing-input - (builds . ,(list->vector - builds-for-missing-input))))) - (datastore-list-setup-failure-missing-inputs - datastore - (assq-ref setup-failure 'id))))) + . ,(list->vector + (map + (lambda (missing-input) + (let ((builds-for-missing-input + (datastore-list-builds-for-output + datastore + missing-input))) + `((missing-input . ,missing-input) + (builds . ,(list->vector + builds-for-missing-input))))) + (datastore-list-setup-failure-missing-inputs + datastore + (assq-ref setup-failure 'id)))))) '()))) (datastore-list-setup-failures-for-build datastore diff --git a/scripts/guix-build-coordinator.in b/scripts/guix-build-coordinator.in index 5c00d7a..0043a7e 100644 --- a/scripts/guix-build-coordinator.in +++ b/scripts/guix-build-coordinator.in @@ -283,10 +283,11 @@ processed?: ~A (when (string=? (assoc-ref setup-failure "failure-reason") "missing_inputs") (simple-format #t " missing inputs:\n") - (for-each (lambda (missing-input) + (for-each (lambda (missing-input-details) (simple-format #t " - ~A\n" - missing-input) + (assoc-ref missing-input-details + "missing-input")) (for-each (lambda (missing-input-build) (simple-format @@ -297,7 +298,8 @@ processed?: ~A "processed")) " (finished)" ""))) - (assoc-ref missing-input "builds"))) + (vector->list + (assoc-ref missing-input-details "builds")))) (vector->list (assoc-ref setup-failure "missing-inputs"))) (newline))) |