nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

offload: Remove redundant call to 'topologically-sorted' in 'send-file'. 

* guix/scripts/offload.scm (send-files): Remove call to
'topologically-sorted'.
This commit is contained in:
Ludovic Courtès 2016-12-01 21:48:20 +01:00
parent 4b67098d9a
commit f3cf860635
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/scripts/offload.scm
View File

@ -429,10 +429,8 @@ be read."
(define (send-files files remote) (define (send-files files remote)
"Send the subset of FILES that's missing to REMOTE, a remote store." "Send the subset of FILES that's missing to REMOTE, a remote store."
(with-store store (with-store store
;; Compute the subset of FILES missing on SESSION, and send them in ;; Compute the subset of FILES missing on SESSION and send them.
;; topologically sorted order so that they can actually be imported. (let* ((session (channel-get-session (nix-server-socket remote)))
(let* ((sorted (topologically-sorted store files))
(session (channel-get-session (nix-server-socket remote)))
(node (make-node session)) (node (make-node session))
(missing (node-eval node (missing (node-eval node
`(begin `(begin
@ -441,11 +439,12 @@ be read."
(with-store store (with-store store
(remove (cut valid-path? store <>) (remove (cut valid-path? store <>)
',sorted))))) ',files)))))
(port (store-import-channel session))) (port (store-import-channel session)))
(format #t (_ "sending ~a store files to '~a'...~%") (format #t (_ "sending ~a store files to '~a'...~%")
(length missing) (session-get session 'host)) (length missing) (session-get session 'host))
;; Send MISSING in topological order.
(export-paths store missing port) (export-paths store missing port)
;; Tell the remote process that we're done. (In theory the ;; Tell the remote process that we're done. (In theory the