all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Tomas Volf <~@wolfsden.cz>
To: 74787@debbugs.gnu.org, 74795@debbugs.gnu.org
Cc: "Tomas Volf" <~@wolfsden.cz>,
	"Christopher Baines" <guix@cbaines.net>,
	"Josselin Poiret" <dev@jpoiret.xyz>,
	"Ludovic Courtès" <ludo@gnu.org>,
	"Mathieu Othacehe" <othacehe@gnu.org>,
	"Simon Tournier" <zimon.toutoune@gmail.com>,
	"Tobias Geerinckx-Rice" <me@tobias.gr>
Subject: [bug#74795] [PATCH] remote: Do not double-quote the repl-command.
Date: Wed, 11 Dec 2024 17:27:55 +0100	[thread overview]
Message-ID: <a70564a4793380970c1005a3813a432d98a2ef2c.1733934475.git.~@wolfsden.cz> (raw)

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




WARNING: multiple messages have this Message-ID (diff)
From: Tomas Volf <~@wolfsden.cz>
To: 74787@debbugs.gnu.org, guix-patches@gnu.org
Cc: "Tomas Volf" <~@wolfsden.cz>,
	"Christopher Baines" <guix@cbaines.net>,
	"Josselin Poiret" <dev@jpoiret.xyz>,
	"Ludovic Courtès" <ludo@gnu.org>,
	"Mathieu Othacehe" <othacehe@gnu.org>,
	"Simon Tournier" <zimon.toutoune@gmail.com>,
	"Tobias Geerinckx-Rice" <me@tobias.gr>
Subject: bug#74787: [PATCH] remote: Do not double-quote the repl-command.
Date: Wed, 11 Dec 2024 17:27:55 +0100	[thread overview]
Message-ID: <a70564a4793380970c1005a3813a432d98a2ef2c.1733934475.git.~@wolfsden.cz> (raw)
In-Reply-To: <2a5dd1c0-6548-46f6-9e31-9bc21811d252@posteo.net>

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




             reply	other threads:[~2024-12-11 16:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-11 16:27 Tomas Volf [this message]
2024-12-11 16:27 ` bug#74787: [PATCH] remote: Do not double-quote the repl-command Tomas Volf
  -- strict thread matches above, loose matches on Subject: below --
2024-12-11 12:55 bug#74787: guile-ssh@0.18 breaks offloading Dariqq
2024-12-11 20:57 ` Dariqq

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='a70564a4793380970c1005a3813a432d98a2ef2c.1733934475.git.~@wolfsden.cz' \
    --to=~@wolfsden.cz \
    --cc=74787@debbugs.gnu.org \
    --cc=74795@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    --cc=guix@cbaines.net \
    --cc=ludo@gnu.org \
    --cc=me@tobias.gr \
    --cc=othacehe@gnu.org \
    --cc=zimon.toutoune@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.