[bug#33267] ssh: Honor the SOCKET-NAME argument of connect-to-remote-daemon.

Message ID 875zxc5cjs.fsf@gmail.com
State New
Headers show
Series
  • [bug#33267] ssh: Honor the SOCKET-NAME argument of connect-to-remote-daemon.
Related show

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Maxim Cournoyer Nov. 5, 2018, 5:16 a.m. UTC
Hi!

The following small issue caught my eye while I was reading the code.

Maxim

Comments

Ludovic Courtès Nov. 5, 2018, 8:46 p.m. UTC | #1
Hi Maxim,

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

>>From dd6d3ee8bec3a99fd178a8efddfa417fbed72a66 Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Mon, 5 Nov 2018 00:01:47 -0500
> Subject: [PATCH] ssh: Honor the SOCKET-NAME argument of
>  connect-to-remote-daemon.
>
> * guix/ssh.scm (connect-to-remote-daemon): Pass the `socket-name' variable to
> the `open-connection' call so that it is honored.

Good catch!  LGTM.

Thanks,
Ludo’.
Maxim Cournoyer Nov. 6, 2018, 2:30 a.m. UTC | #2
ludo@gnu.org (Ludovic Courtès) writes:

[...]

>> * guix/ssh.scm (connect-to-remote-daemon): Pass the `socket-name' variable to
>> the `open-connection' call so that it is honored.
>
> Good catch!  LGTM.

Pushed as 2e4d83398. Thanks!

Maxim
Maxim Cournoyer Nov. 6, 2018, 2:30 a.m. UTC | #3
Closing.

Patch

From dd6d3ee8bec3a99fd178a8efddfa417fbed72a66 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 5 Nov 2018 00:01:47 -0500
Subject: [PATCH] ssh: Honor the SOCKET-NAME argument of
 connect-to-remote-daemon.

* guix/ssh.scm (connect-to-remote-daemon): Pass the `socket-name' variable to
the `open-connection' call so that it is honored.
---
 guix/ssh.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/ssh.scm b/guix/ssh.scm
index da20d4d8d..25ec8295e 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -161,7 +161,7 @@  Throw an error on failure."
                                     "/var/guix/daemon-socket/socket"))
   "Connect to the remote build daemon listening on SOCKET-NAME over SESSION,
 an SSH session.  Return a <nix-server> object."
-  (open-connection #:port (remote-daemon-channel session)))
+  (open-connection #:port (remote-daemon-channel session socket-name)))
 
 
 (define (store-import-channel session)
-- 
2.19.0