guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/15: remote: Do not double-quote the repl-command.


From: guix-commits
Subject: 12/15: remote: Do not double-quote the repl-command.
Date: Thu, 12 Dec 2024 06:54:26 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit c673b64d9de18b5dd5b2d0673cb83096170531d3
Author: Tomas Volf <~@wolfsden.cz>
AuthorDate: Wed Dec 11 17:27:55 2024 +0100

    remote: Do not double-quote the repl-command.
    
    Fixes <https://issues.guix.gnu.org/74787>.
    
    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
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
    Reported-by: Dariqq <dariqq@posteo.net>
---
 guix/remote.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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* (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 @@ BECOME-COMMAND is given, use that to invoke the remote Guile 
REPL."
                           `("-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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]