summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/ssh.scm6
1 files 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 . _)