diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-08-01 23:42:28 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-01 23:42:28 +0200 |
commit | aa9780daf92131dc9ee19868f9621fd2be56ab78 (patch) | |
tree | 39733db2ecad867c291d87d5d1cbf4e6de2eb845 /gnu/packages/patches/guile-ssh-rexec-bug.patch | |
parent | 6484e82d4ce79b7b5ce72ecf77fb8d450eb0c401 (diff) | |
parent | fc8f0631b4163d31a97fccb9a14201b5e861fa52 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/guile-ssh-rexec-bug.patch')
-rw-r--r-- | gnu/packages/patches/guile-ssh-rexec-bug.patch | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/gnu/packages/patches/guile-ssh-rexec-bug.patch b/gnu/packages/patches/guile-ssh-rexec-bug.patch deleted file mode 100644 index 363fea38c9..0000000000 --- a/gnu/packages/patches/guile-ssh-rexec-bug.patch +++ /dev/null @@ -1,16 +0,0 @@ -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)))) |