From e2f4a5704be2103cc271969543dff20ad1f3b3d3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 May 2021 23:24:15 +0200 Subject: ssh: 'connect-to-remote-daemon' raises a nicer message upon error. * guix/ssh.scm (connect-to-remote-daemon): Catch 'store-connection-error?' and rethrow. --- guix/ssh.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/ssh.scm b/guix/ssh.scm index 457d1890f9..b39b90f733 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -302,8 +302,13 @@ EXP never returns or calls 'primitive-exit' when it's done." "/var/guix/daemon-socket/socket")) "Connect to the remote build daemon listening on SOCKET-NAME over SESSION, an SSH session. Return a 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) "Return an output port to which archives to be exported to SESSION's store -- cgit v1.2.3