kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

remote, ssh: Show the command exit status upon failure.

Browse Source 
* guix/remote.scm (remote-pipe-for-gexp): Show the exit status in error
message.
* guix/ssh.scm (remote-inferior): Likewise.
This commit is contained in:
Ludovic Courtès 2019-08-28 18:51:12 +02:00
parent 2a5f781e76
commit e09c7f4ae4
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/remote.scm
View File

@ -27,6 +27,7 @@
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (ssh popen) #:use-module (ssh popen)
#:use-module (ssh channel)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
@ -68,10 +69,13 @@ BECOME-COMMAND is given, use that to invoke the remote Guile REPL."
(let ((pipe (apply open-remote-pipe* session OPEN_READ repl-command))) (let ((pipe (apply open-remote-pipe* session OPEN_READ repl-command)))
(when (eof-object? (peek-char pipe)) (when (eof-object? (peek-char pipe))
(raise (condition (let ((status (channel-get-exit-status pipe)))
(&message (close-port pipe)
(message (format #f (G_ "failed to run '~{~a~^ ~}'") (raise (condition
repl-command)))))) (&message
(message (format #f (G_ "remote command '~{~a~^ ~}' failed \
with status ~a")
repl-command status)))))))
pipe)) pipe))
(define* (%remote-eval lowered session #:optional become-command) (define* (%remote-eval lowered session #:optional become-command)

14
guix/ssh.scm
View File

@ -106,14 +106,14 @@ given, use that to invoke the remote Guile REPL."
(let* ((repl-command (append (or become-command '()) (let* ((repl-command (append (or become-command '())
'("guix" "repl" "-t" "machine"))) '("guix" "repl" "-t" "machine")))
(pipe (apply open-remote-pipe* session OPEN_BOTH repl-command))) (pipe (apply open-remote-pipe* session OPEN_BOTH repl-command)))
;; XXX: 'channel-get-exit-status' would be better here, but hangs if the
;; process does succeed. This doesn't reflect the documentation, so it's
;; possible that it's a bug in guile-ssh.
(when (eof-object? (peek-char pipe)) (when (eof-object? (peek-char pipe))
(raise (condition (let ((status (channel-get-exit-status pipe)))
(&message (close-port pipe)
(message (format #f (G_ "failed to run '~{~a~^ ~}'") (raise (condition
repl-command)))))) (&message
(message (format #f (G_ "remote command '~{~a~^ ~}' failed \
with status ~a")
repl-command status)))))))
(port->inferior pipe))) (port->inferior pipe)))
(define* (inferior-remote-eval exp session #:optional become-command) (define* (inferior-remote-eval exp session #:optional become-command)