02/03: gnu: guile-ssh: Fix bug in 'node-guile-version'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 5a3429bcc52a47ca9c879b9ace092eecddeed300
Author: Ludovic Courtès <address@hidden>
Date:   Tue May 16 14:15:59 2017 +0200

    gnu: guile-ssh: Fix bug in 'node-guile-version'.
    
    * gnu/packages/patches/guile-ssh-rexec-bug.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/ssh.scm (guile-ssh)[source](patches): New field.
---
 gnu/local.mk                                   |  1 +
 gnu/packages/patches/guile-ssh-rexec-bug.patch | 16 ++++++++++++++++
 gnu/packages/ssh.scm                           |  1 +
 3 files changed, 18 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index f6e911b..c560c71 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -649,6 +649,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/guile-present-coding.patch              \
   %D%/packages/patches/guile-relocatable.patch                 \
   %D%/packages/patches/guile-rsvg-pkgconfig.patch              \
+  %D%/packages/patches/guile-ssh-rexec-bug.patch               \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch       \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtk2-theme-paths.patch                  \
diff --git a/gnu/packages/patches/guile-ssh-rexec-bug.patch 
b/gnu/packages/patches/guile-ssh-rexec-bug.patch
new file mode 100644
index 0000000..363fea3
--- /dev/null
+++ b/gnu/packages/patches/guile-ssh-rexec-bug.patch
@@ -0,0 +1,16 @@
+Fix a bug whereby 'node-guile-version' would pass a node instead of
+a session to 'rexec'.
+
+diff --git a/modules/ssh/dist/node.scm b/modules/ssh/dist/node.scm
+index 9c065c7..29a3906 100644
+--- a/modules/ssh/dist/node.scm
++++ b/modules/ssh/dist/node.scm
+@@ -411,7 +411,8 @@ procedure returns the 1st evaluated value if multiple 
values were returned."
+   "Get Guile version installed on a NODE, return the version string.  Return
+ #f if Guile is not installed."
+   (receive (result rc)
+-      (rexec node "which guile > /dev/null && guile --version")
++      (rexec (node-session node)
++             "which guile > /dev/null && guile --version")
+     (and (zero? rc)
+          (car result))))
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 1fd3950..6a074d1 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -226,6 +226,7 @@ Additionally, various channel-specific options can be 
negotiated.")
               (sha256
                (base32
                 "0r261i8kc3avbmbwgyzak2vnqwssjlgz37g2y2fwm80w9bmn2m7j"))
+              (patches (search-patches "guile-ssh-rexec-bug.patch"))
               (modules '((guix build utils)))
               (snippet
                ;; 'configure.ac' mistakenly tries to link files from examples/