diff options
author | Christopher Baines <mail@cbaines.net> | 2020-05-09 19:05:33 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2020-05-09 19:05:33 +0100 |
commit | 1ec0da100859a986e4e6c58c2edb2d238d64b170 (patch) | |
tree | 5b33d510d205c5b5ac9c13a2c85c29ba4ea73e6e /guix-build-coordinator/coordinator.scm | |
parent | 7981e52681231c06a4de4cbc8639fa251e13f9da (diff) | |
download | build-coordinator-1ec0da100859a986e4e6c58c2edb2d238d64b170.tar build-coordinator-1ec0da100859a986e4e6c58c2edb2d238d64b170.tar.gz |
Rework the ensure-all-related-derivations-have-builds option
This was resulting in duplicate builds for the same output, as that's not what
it was guarding against, but I think that was my intention... Anyway this
should actually only result in builds being created for outputs that are
required.
Diffstat (limited to 'guix-build-coordinator/coordinator.scm')
-rw-r--r-- | guix-build-coordinator/coordinator.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/guix-build-coordinator/coordinator.scm b/guix-build-coordinator/coordinator.scm index 9fa2ca7..4a2acd4 100644 --- a/guix-build-coordinator/coordinator.scm +++ b/guix-build-coordinator/coordinator.scm @@ -77,14 +77,14 @@ requested-uuid (priority 0) (defer-allocation? #f) - (ensure-all-related-derivations-have-builds? #f)) + (ensure-all-related-derivation-outputs-have-builds? #f)) (let ((datastore (build-coordinator-datastore build-coordinator)) (uuid (or requested-uuid (random-v4-uuid)))) (datastore-store-derivation datastore derivation) - (when ensure-all-related-derivations-have-builds? - (let ((related-derivations - (datastore-list-related-derivations-with-no-build + (when ensure-all-related-derivation-outputs-have-builds? + (let ((derivations-lacking-builds + (datastore-list-related-derivations-with-no-build-for-outputs datastore (derivation-file-name derivation)))) (for-each @@ -99,7 +99,7 @@ ;; Let the scheduler take care of ;; the prioritisation 0))) - related-derivations))) + derivations-lacking-builds))) (datastore-store-build datastore (derivation-file-name derivation) |