From 63fd9f084a5e345d2edaeaf5e8f435a3130f9edc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 24 Nov 2018 19:38:55 +0100 Subject: ssh: Make 'send-files' more robust. Possibly fixes . * guix/ssh.scm (send-files): Call 'channel-get-exit-status' only when RESULT is true. --- guix/ssh.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/ssh.scm b/guix/ssh.scm index 25ec8295e8..104f4f52d6 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -297,9 +297,11 @@ Return the list of store items actually sent." (channel-send-eof port) ;; Wait for completion of the remote process and read the status sexp from - ;; PORT. + ;; PORT. Wait for the exit status only when 'read' completed; otherwise, + ;; we might wait forever if the other end is stuck. (let* ((result (false-if-exception (read port))) - (status (zero? (channel-get-exit-status port)))) + (status (and result + (zero? (channel-get-exit-status port))))) (close-port port) (match result (('success . _) -- cgit 1.4.1