* [bug#74795] [PATCH] remote: Do not double-quote the repl-command.
@ 2024-12-11 16:27 ` Tomas Volf
2024-12-11 16:27 ` bug#74787: " Tomas Volf
2024-12-12 11:45 ` bug#74787: guile-ssh@0.18 breaks offloading Ludovic Courtès
0 siblings, 2 replies; 3+ messages in thread
From: Tomas Volf @ 2024-12-11 16:27 UTC (permalink / raw)
To: 74787, 74795
Cc: Tomas Volf, Christopher Baines, Josselin Poiret,
Ludovic Courtès, Mathieu Othacehe, Simon Tournier,
Tobias Geerinckx-Rice
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(-)
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))
--
2.46.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#74787: [PATCH] remote: Do not double-quote the repl-command.
2024-12-11 16:27 ` [bug#74795] [PATCH] remote: Do not double-quote the repl-command Tomas Volf
@ 2024-12-11 16:27 ` Tomas Volf
2024-12-12 11:45 ` bug#74787: guile-ssh@0.18 breaks offloading Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: Tomas Volf @ 2024-12-11 16:27 UTC (permalink / raw)
To: 74787, guix-patches
Cc: Tomas Volf, Christopher Baines, Josselin Poiret,
Ludovic Courtès, Mathieu Othacehe, Simon Tournier,
Tobias Geerinckx-Rice
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(-)
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))
--
2.46.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#74787: guile-ssh@0.18 breaks offloading
2024-12-11 16:27 ` [bug#74795] [PATCH] remote: Do not double-quote the repl-command Tomas Volf
2024-12-11 16:27 ` bug#74787: " Tomas Volf
@ 2024-12-12 11:45 ` Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2024-12-12 11:45 UTC (permalink / raw)
To: Tomas Volf
Cc: Josselin Poiret, Simon Tournier, Mathieu Othacehe,
Tobias Geerinckx-Rice, Dariqq, Christopher Baines, 74787-done,
guix-patches
Hi Tomas and Dariqq,
Tomas Volf <~@wolfsden.cz> skribis:
> 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
Added the “Fixes” and “Reported-by” lines to the log and committed.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-12 11:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <2a5dd1c0-6548-46f6-9e31-9bc21811d252@posteo.net>
2024-12-11 16:27 ` [bug#74795] [PATCH] remote: Do not double-quote the repl-command Tomas Volf
2024-12-11 16:27 ` bug#74787: " Tomas Volf
2024-12-12 11:45 ` bug#74787: guile-ssh@0.18 breaks offloading Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).