[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/11: ssh: 'connect-to-remote-daemon' raises a nicer message upon error
From: |
guix-commits |
Subject: |
08/11: ssh: 'connect-to-remote-daemon' raises a nicer message upon error. |
Date: |
Sat, 8 May 2021 09:08:59 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit e2f4a5704be2103cc271969543dff20ad1f3b3d3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed May 5 23:24:15 2021 +0200
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 457d189..b39b90f 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 <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)
"Return an output port to which archives to be exported to SESSION's store
- branch master updated (e118348 -> f903bb7), guix-commits, 2021/05/08
- 02/11: gnu: Add font-montserrat., guix-commits, 2021/05/08
- 01/11: gnu: ocaml: Depend on libiberty., guix-commits, 2021/05/08
- 04/11: gnu: Add volctl., guix-commits, 2021/05/08
- 03/11: gnu: xfce4-session: Allow xflock4 to use xset., guix-commits, 2021/05/08
- 06/11: weather: '--display-missing' shows the system type of missing items., guix-commits, 2021/05/08
- 11/11: services: configuration: Export 'no-serialization' syntactic keyword., guix-commits, 2021/05/08
- 05/11: gnu: volctl: Comment on the license., guix-commits, 2021/05/08
- 07/11: store: 'open-connection' never returns #f., guix-commits, 2021/05/08
- 08/11: ssh: 'connect-to-remote-daemon' raises a nicer message upon error.,
guix-commits <=
- 10/11: ssh: Honor GUIX_DAEMON_SOCKET on the target machine., guix-commits, 2021/05/08
- 09/11: store: Export 'connect-to-daemon'., guix-commits, 2021/05/08