aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Volf <~@wolfsden.cz>2024-12-11 17:27:55 +0100
committerLudovic Courtès <ludo@gnu.org>2024-12-12 12:52:08 +0100
commitc673b64d9de18b5dd5b2d0673cb83096170531d3 (patch)
tree0c30f7cbe40024cb9439fc1856e5a94ab5b819f3
parent33bed951079e11bc89bfaf9e9e4af3eb059a2951 (diff)
downloadguix-c673b64d9de18b5dd5b2d0673cb83096170531d3.tar.gz
guix-c673b64d9de18b5dd5b2d0673cb83096170531d3.zip
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>
-rw-r--r--guix/remote.scm5
1 files changed, 1 insertions, 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))