me/guix
Archived
1
0
Fork 0
Code Activity

ssh: 'connect-to-remote-daemon' raises a nicer message upon error.

Browse source 
* guix/ssh.scm (connect-to-remote-daemon): Catch
'store-connection-error?' and rethrow.
This commit is contained in:
Ludovic Courtès 2021-05-05 23:24:15 +02:00
parent e3e0886c2d
commit e2f4a5704b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
guix/ssh.scm
View file

@ -302,8 +302,13 @@ EXP never returns or calls 'primitive-exit' when it's done."
"/var/guix/daemon-socket/socket")) "/var/guix/daemon-socket/socket"))
"Connect to the remote build daemon listening on SOCKET-NAME over SESSION, "Connect to the remote build daemon listening on SOCKET-NAME over SESSION,
an SSH session. Return a <store-connection> object." an SSH session. Return a <store-connection> object."
(open-connection #:port (remote-daemon-channel session socket-name))) (guard (c ((store-connection-error? c)
;; Raise a more focused error condition.
(raise (formatted-message
(G_ "failed to connect over SSH to daemon at '~a', socket ~a")
(session-get session 'host)
socket-name))))
(open-connection #:port (remote-daemon-channel session socket-name))))
(define (store-import-channel session) (define (store-import-channel session)
"Return an output port to which archives to be exported to SESSION's store "Return an output port to which archives to be exported to SESSION's store