diff mbox series

[bug#74795] remote: Do not double-quote the repl-command.

Message ID a70564a4793380970c1005a3813a432d98a2ef2c.1733934475.git.~@wolfsden.cz
State New
Headers
Series [bug#74795] remote: Do not double-quote the repl-command. |

Commit Message

Tomas Volf Dec. 11, 2024, 4:27 p.m. UTC 
In 0.18.0, the `open-remote-pipe*' now correctly quotes the arguments, so the
double quoting that was done by `shell-quote' is not harmful and breaks at
least offloading and deploy.

* guix/remote.scm (remote-pipe-for-gexp): Call object->string just once.

Change-Id: Id922d26d318bfdd4714e267687c1b27461196d90
---
I checked all places where the changed procedures are used and those look
correct.  Nothing else in the NEWS file for 0.18.0 jumps out as a potential
issue.

 guix/remote.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--
2.46.0
diff mbox series

Patch

diff --git a/guix/remote.scm b/guix/remote.scm
index a58ec2103c..9423f9af12 100644
--- a/guix/remote.scm
+++ b/guix/remote.scm
@@ -48,9 +48,6 @@  (define-module (guix remote)
 (define* (remote-pipe-for-gexp lowered session #:optional become-command)
   "Return a remote pipe for the given SESSION to evaluate LOWERED.  If
 BECOME-COMMAND is given, use that to invoke the remote Guile REPL."
-  (define shell-quote
-    (compose object->string object->string))
-
   (define repl-command
     (append (or become-command '())
             (list
@@ -65,7 +62,7 @@  (define* (remote-pipe-for-gexp lowered session #:optional become-command)
                           `("-C" ,directory))
                         (lowered-gexp-load-path lowered))
             `("-c"
-              ,(shell-quote (lowered-gexp-sexp lowered)))))
+              ,(object->string (lowered-gexp-sexp lowered)))))

   (let ((pipe (apply open-remote-pipe* session OPEN_READ repl-command)))
     (when (eof-object? (peek-char pipe))