From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GOpzAvvaWWctLgAA62LTzQ:P1 (envelope-from ) for ; Wed, 11 Dec 2024 18:33:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id GOpzAvvaWWctLgAA62LTzQ (envelope-from ) for ; Wed, 11 Dec 2024 19:33:31 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ZAqBhzy1; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=UpNJEBlI; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=ZMUwWkfl; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=wolfsden.cz (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733942010; a=rsa-sha256; cv=none; b=Kyq4bGS9FGGYXsTbInW2XCWuPakuBxNLJ3AgIxY0eLUXApLc5csJWke+FyuGfiJ+UeYo9q qN/BBrc3RpXUiFb7DpF01w/DGTQTzCcp2mHnp16H1aYOF8YvhW2OYXAW+RJ+46uRE4BPxO Ev6/i1N0r3S+/wLwKz/BheOVwiVeb9+MAEiicurBzfclYrNbIHccw9qwsG0z3HJ/E0U7l6 dgYmLqDDZKjBSapVUX8Cu6Zznm7WZauZD8BuR70yXhpguKzaGFk5Y4Dg+6GMgJiu6k/4CT E3PEu0drHfK1BPPJnZnEhDhPbYjV+mH3DlhUykNhWwz+SkJOEpwHTzUSHgyifg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ZAqBhzy1; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=UpNJEBlI; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=ZMUwWkfl; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=wolfsden.cz (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733942010; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=FLJKWo+s9srs4z/C3lHCjVtcn0LxKzOvkMGkLaQDtF4=; b=q6dFNkjGtjk0w79cOI71YSgN09q0UX2fu/+PHNsVEfCRv7Vp8RQjJxeE7NyKoi9tL8WpfL CCSa0biWWvYEV2csTqUDdtktwC08EX8E2BZqaDNcQF2ucntNhFIibN+NJRGvzUbt8H71WG v6l4XfK4u35I64vuiXmQ5a28HfdfvYlsql7o+e8y5alsB4hNiWqpLTN3s5C0IyVtwh6djT ZBlilCUV8HmiCTJiDQ2H9rGlR9Q1JxJ0+QpAitmSdnRtSeingzB085K97IuJOe3Rlwrrkt LlKVWlTtZgSBpBEHBcAOLeu0hBvTp6+B4j3xd5CX++EBppGez9TFbb/4D7wWVg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BD52D797C0 for ; Wed, 11 Dec 2024 19:33:29 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLPbH-0007jB-NG; Wed, 11 Dec 2024 11:30:11 -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 1tLPbF-0007ee-0o for bug-guix@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-00012H-IU; 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:In-Reply-To:References:Subject; bh=FLJKWo+s9srs4z/C3lHCjVtcn0LxKzOvkMGkLaQDtF4=; b=ZAqBhzy1KKD9e3g/BxbGw/LR4r+9tfgFt+96EvblMD3xYdRRd0uKgF7OwpaS7kL5QPGENOg/WNPcIkA0KggD4Dpjdgzd+c1rLQJ8Z/1dDYc9OBdMcA0nVr5EqDAUhwtuxVRPIunE+FksISp9FkCafVQQMqZmOtg0dhwtZtfhTklnRy/rcKdEYKyuoSqCfo0RUCd9VX/L61FDVii7dKtF07tbYBly6mMd/NYNZUrmNUwjfxPeZrj/lTZYAYD3bCcKSvQm6xHKG1Vq05DdJNNOs1yeTVBrq6+uSO+zDDIQPqC2Ef6+5RDSYmagDZR98M+YLf74jg6CHT8Tm47WFxRtLQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tLPb9-0003AP-FH; Wed, 11 Dec 2024 11:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#74787: [PATCH] remote: Do not double-quote the repl-command. References: <2a5dd1c0-6548-46f6-9e31-9bc21811d252@posteo.net> In-Reply-To: <2a5dd1c0-6548-46f6-9e31-9bc21811d252@posteo.net> 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, bug-guix@gnu.org Resent-Date: Wed, 11 Dec 2024 16:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74787 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 74787@debbugs.gnu.org, guix-patches@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-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74787-submit@debbugs.gnu.org id=B74787.173393457111997 (code B ref 74787); Wed, 11 Dec 2024 16:30:03 +0000 Received: (at 74787) by debbugs.gnu.org; 11 Dec 2024 16:29:31 +0000 Received: from localhost ([127.0.0.1]:35903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLPac-00037Q-Kv for submit@debbugs.gnu.org; Wed, 11 Dec 2024 11:29:30 -0500 Received: from wolfsden.cz ([37.205.8.62]:33218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tLPaa-00037D-Ke for 74787@debbugs.gnu.org; Wed, 11 Dec 2024 11:29:30 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 3B54D3506A7; 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 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: BD52D797C0 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.19 X-Spam-Score: -4.19 X-TUID: uPTOqTxYeAbd 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