From patchwork Wed Dec 11 16:27:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 34799 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 731D327BBEA; Wed, 11 Dec 2024 16:49:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6456B27BBE9 for ; Wed, 11 Dec 2024 16:49:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLPbI-0007l5-Gd; Wed, 11 Dec 2024 11:30:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLPbE-0007eJ-Tc for guix-patches@gnu.org; Wed, 11 Dec 2024 11:30:09 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tLPbE-00012C-Fv; Wed, 11 Dec 2024 11:30:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=FLJKWo+s9srs4z/C3lHCjVtcn0LxKzOvkMGkLaQDtF4=; b=XCa35d8Nld/zkzskxEMEo7Do62qltvA4b79x932CyNFRMWL4sCQ/Ke1NK6QglGcGFm5Spnq9yxur0/9RGQa9d/fk5VqtRsVNQoWVoNs5YcgyopwNWE2dw6ptDepr9TabWp12sea8cQUm9q7GYPsFaCMQf2Gmxt9y75ct6upAjuOJA7NJLU9lSUdS2mRjJk3Rro3GE0SEHlqB/9udyCHije528iLXf2N2xpQ0caL4MipFGUthRXdYMeFaoN1Z5qmR9UdBfj5RKkKY6BDylwaoS5YkD4tsKmnlUbg6c28+hMfsxSB+k5QYwhU77Y88rATeqyQjGSMn93pY9FaxsCOWAQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tLPb8-0003A6-L5; Wed, 11 Dec 2024 11:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74795] [PATCH] remote: Do not double-quote the repl-command. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 11 Dec 2024 16:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74795 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74787@debbugs.gnu.org, 74795@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: 74787@debbugs.gnu.org, guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.173393457412025 (code B ref -1); Wed, 11 Dec 2024 16:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Dec 2024 16:29:34 +0000 Received: from localhost ([127.0.0.1]:35908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLPag-00037p-0R for submit@debbugs.gnu.org; Wed, 11 Dec 2024 11:29:34 -0500 Received: from lists.gnu.org ([209.51.188.17]:35902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tLPae-00037g-Gh for submit@debbugs.gnu.org; Wed, 11 Dec 2024 11:29:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tLPad-0004I5-QJ for guix-patches@gnu.org; Wed, 11 Dec 2024 11:29:32 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tLPac-0000lr-43 for guix-patches@gnu.org; Wed, 11 Dec 2024 11:29:31 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 6AA9A35149D; Wed, 11 Dec 2024 16:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1733934567; bh=juVAUPIlGrC5hCvs4lnZ+eSzRMzNa+M4JYXvbS2cKPc=; h=From:To:Cc:Subject:Date; b=UpNJEBlIz4Ei1Sz+84aDxPeUWh4JkGwdij1QTxENyfg2bJaFwQpbKGYxZ9dS5pyZL BkxBjsQNfNZ6K0MDOocps57H4RXKuaJRbHjzoKKae0v0WXaGAfeEHwRYB0soa1pAF1 HEq5rcmhRHR9D5fF5L/OysfmImsX90MEjHMar9TnFyCLzCHSU6a5If0EXecpKRzNSr 1UROm2vQL60L0GhETmj1vehMawDrOHGw18L/0vrQOylw/tQzQluaGAASwBn0a3nR7e 56Lmzh7ckoaVIgqeKodD3kicMcGPtiZrSbVG2IwNUYkMn5Z68H+2N4OhNj0rqVkVLL qoJ9HoCxOLRiySo+i8dU2z5l52TEO031X6R7iisD2FwAsb9MCuhAJQDJO8+bYX1E3e Q8NekpxC+kB4Y54uCCiDS61Vor/kN9tV3gacSdVPsjNLNrM48ChmxL3AgS/qamx7ki foxb6P2/OznbDlqauiaVR7mmzU6qFExAdu9isTb+ppOSYatKlF6MV0kzXrY0rmzdy2 46WDM6tPWO1/z9/ab5S9+olndzGsC+scK9Su1Se1h0ROv7L/1CP1LvfzeWaaULQLiq siGeyz2fZMIDkEyqA7gkg0+Fl5jRPHJUV6VlfDi7itkOddNRNchgDkr8HtfibmQjsC 29MaTpbShkskLZ4C8OcTtFlI= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id D1B46350E09; Wed, 11 Dec 2024 16:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1733934566; bh=juVAUPIlGrC5hCvs4lnZ+eSzRMzNa+M4JYXvbS2cKPc=; h=From:To:Cc:Subject:Date; b=ZMUwWkfl28yV9lI6VzUoyI6pM+njKt4IdsB9BvqcdrF+R8pmMHiyT1Eqr187kwkIF LuG8fK57RGeXgYHK7XKkuRW9Jihif52m6UAzpFU5eqPLEHYZXMMx15gNE1QVLf7aif cCDhBYhqbQ6pe1D1fbWatba8rKfbm1w1abA0VdCHi3MjGbgtghkTHWepqqx+gHRIRh L++5AG4Vrp711o9zE2J1I9z1pegUmSCbFdLBgJ/xcGjm8+JBcSWFBZJzKE3ydh2p8X ZXrJeT2HLo9WfRGRvueGmDPuvbwovEX74IR6UY+SvPjzcCEN8M8HeQiCsu52tkd7hH AzbhfvSSUT08eAPQ66D/XDafcl//aLVU2ANlrch/ZlR9iYJlUvnr6v9m2lqoJR+wh/ +8R09Eb6puikySpvttaeXV1YNdhI/t2T9onoV5w6r5Z4OhRYLojiUJCj5WOFzx+yls hzyKz75Km5S0yyqd/PlQ3ASlUJ/81SfEjgYfVOXOPZcz8ckmSx1z4fnC/1H/dQzOwY 3hMTczS+LgtV2HWABZM6C/DgmXiZH4RNhy86PfjfzSRerIiyom8ALJ3ZSOELZmc4oI DKF52OdSeq8uotXNhi3utBsvkuQmw9RlqTJxGLq2W28dpuyfN6qNgDfKPPhiqKU9+7 8OnW+mjRdMjLAmK+s0v5Sld4= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 11 Dec 2024 17:27:55 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 --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))