summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-04-09 11:06:46 +0200
committerLudovic Courtès <ludo@gnu.org>2018-04-09 11:06:46 +0200
commit2f37403606d31b7b9bfe68c57665d41faaa1d100 (patch)
tree1ae86445f632d01a80a910985dc2ddba6fc40510
parent297b29190eb10576de1a5f736286bcbc3d4a6352 (diff)
downloadcuirass-2f37403606d31b7b9bfe68c57665d41faaa1d100.tar
cuirass-2f37403606d31b7b9bfe68c57665d41faaa1d100.tar.gz
base: 'spawn-builds' really builds by chunks.
Fixes a regression introduced in 074b9d02f1ca01007f39adbc019763027a51d9bd whereby we'd attempt to build all of DRV at once. * src/cuirass/base.scm (spawn-builds): Pass BATCH, not DRV, to 'build-derivations&' and to 'update-build-statuses!'.
-rw-r--r--src/cuirass/base.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index 9e930d4..9985fd6 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -448,7 +448,7 @@ Derivations are submitted in batches of at most MAX-BATCH-SIZE items."
(log-message "building batch of ~a derivations (~a/~a)"
max-batch-size (- total count) total)
(let-values (((port finish)
- (build-derivations& store drv)))
+ (build-derivations& store batch)))
(process-build-log port
(lambda (event state)
;; Catch any errors so we can keep reading
@@ -467,7 +467,7 @@ Derivations are submitted in batches of at most MAX-BATCH-SIZE items."
;; 'build-derivations' doesn't actually do anything and
;; 'handle-build-event' doesn't see any event. Because of that,
;; adjust DB here.
- (update-build-statuses! store db drv)
+ (update-build-statuses! store db batch)
(loop rest (max (- count max-batch-size) 0))))))