amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

offload: '{send,receive}-files' wait for completion of the transfer.

Browse source 
Fixes situations where the remote 'guix build' is invoked before the
.drv has been completely copied, as reported at
<https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00174.html>.

In some cases 'send-files' would return before the other end is done
importing the files, and so the subsequent 'guix build' invocation would
just miss the .drv file it refers to.

* guix/utils.scm (call-with-decompressed-port): Don't close PORT.
  (call-with-compressed-output-port): Likewise.
* tests/utils.scm ("compressed-output-port + decompressed-port"): Adjust
  accordingly.
* guix/scripts/offload.scm (send-files): Add explicit (close-pipe pipe)
  call.
  (retrieve-files): Likewise.
This commit is contained in:
Ludovic Courtès 2014-04-14 00:24:24 +02:00
parent 66ef541147
commit 30ce8012cd
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/utils.scm
View file

@ -164,10 +164,12 @@
(false-if-exception (delete-file temp-file))
(test-assert "compressed-output-port + decompressed-port"
(let* ((file (search-path %load-path "guix/derivations.scm"))
(data (call-with-input-file file get-bytevector-all)))
(call-with-compressed-output-port 'xz (open-file temp-file "w0b")
(data (call-with-input-file file get-bytevector-all))
(port (open-file temp-file "w0b")))
(call-with-compressed-output-port 'xz port
(lambda (compressed)
(put-bytevector compressed data)))
(close-port port)
(bytevector=? data
(call-with-decompressed-port 'xz (open-file temp-file "r0b")