diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-10-28 19:21:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-10-28 21:30:27 +0200 |
| commit | 2015d3f042870860efef10e801b93eacc0742d38 (patch) | |
| tree | e442da4d986eab8a63c8dca758272768e92f9716 /guix/remote.scm | |
| parent | 45b251fd045fe47dd65d42a269508ee50f26565d (diff) | |
| download | guix-2015d3f042870860efef10e801b93eacc0742d38.tar guix-2015d3f042870860efef10e801b93eacc0742d38.tar.gz | |
store: 'map/accumulate-builds' handler checks the store received.
This is a followup to b19250eec6f92308f237a09a43e8e3e2355345b9,
providing a proper fix for <https://issues.guix.gnu.org/46756>.
* guix/remote.scm (remote-eval): Revert b19250eec6f92308f237a09a43e8e3e2355345b9.
* guix/store.scm (build-accumulator): Turn into a procedure. Call
CONTINUE when the store is not eq? to the initial store.
(map/accumulate-builds): Adjust accordingly.
* tests/store.scm ("map/accumulate-builds and different store"): New test.
Diffstat (limited to 'guix/remote.scm')
| -rw-r--r-- | guix/remote.scm | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/guix/remote.scm b/guix/remote.scm index 37e9827084..f6adb22846 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -146,15 +146,6 @@ remote store." sources))) (mbegin %store-monad ((store-lift send-files) to-send remote #:recursive? #t) - - ;; Build handlers are not tied to a specific <store-connection>. - ;; If a handler is already installed, it might want to go ahead - ;; and build, but on the local <store-connection> instead of - ;; REMOTE. To avoid that, install a build handler that does - ;; nothing. - (return (with-build-handler (lambda (continue . _) - (continue #t)) - (build-derivations remote inputs))) - + (return (build-derivations remote inputs)) (return (close-connection remote)) (return (%remote-eval lowered session become-command))))))) |