From 2015d3f042870860efef10e801b93eacc0742d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 28 Oct 2021 19:21:50 +0200 Subject: store: 'map/accumulate-builds' handler checks the store received. This is a followup to b19250eec6f92308f237a09a43e8e3e2355345b9, providing a proper fix for . * 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. --- guix/remote.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'guix/remote.scm') 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 . - ;; If a handler is already installed, it might want to go ahead - ;; and build, but on the local 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))))))) -- cgit v1.2.3