From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id kElKLIv3w2WHKQAA62LTzQ:P1 (envelope-from ) for ; Wed, 07 Feb 2024 22:35:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id kElKLIv3w2WHKQAA62LTzQ (envelope-from ) for ; Wed, 07 Feb 2024 22:35:07 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=OkZ6lxct; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707341707; a=rsa-sha256; cv=none; b=rXMXzAssEXiu0wjBlRiJF0DeUIlQ6zZY3bGI/P3S90tNEsvUJdUUWCFqQmtovM4SeiMoPx j3yPiT2z3uNHDrjtDSMgQmomf1zFxjRY5rGCRbfSSBJI+Z16kIxRhZU1tPsi33cI5tebuU eZLNmir+bQRw9dFLLhiTJHdipES3/RbNRWTuA1ouOsW+iM79tzBHXnaJoycZ1AglbFUhAL kK6sUUeczrzAB2lZ4R7J+bWckKFc9Yelw3AQD7aLIjMZvNT6gbhld0PmvJ0hmMkq25zkPq l65HErHppZ1tUhstqcWzzo+/j1SLV9YP4jMrk4E1UMiKpRheEsvfPZ070wtVLw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=OkZ6lxct; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707341707; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=tDskGhrJ1Y7Jdp/3nEXj+Z1AKnwTcUoyimmG+jOC6BY=; b=JSXFfFeYXslf/a+l0mkCubfrFIj/R/2UHrV7K68oEldcSPPpNC+RBr+T7wj2GeuIJ/W1j2 ku/2Fqa6JEcUWjhb02xsyxMJw/f9FURapWYgJEgisWE2X+oo7WBlHb4CXZsHDngSr+yXKI A+5+koB9kMqn/Ef978NCaoQazYGlhqaF5XCobg0aBZsLo8KDFmZYpfQ1pUcTVxD9rWQ7dD ojdCCTPRKBbbfPTdQKY+DXR5HEmC4TV7W95WD+m+UZR2FctV/lFy1+Q03KjPNGrOyg7HWP WrjwgpW1AQNWtNMUfpQ1sHhN8BCZcHhB+WNejM1Xnr8M5exo3qCgKzFDUyKSuQ== 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 A274A271EE for ; Wed, 7 Feb 2024 22:35:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXpZD-000308-0Y; Wed, 07 Feb 2024 16:34:51 -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 1rXpZB-0002zu-7I for guix-patches@gnu.org; Wed, 07 Feb 2024 16:34:49 -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 1rXpZA-00041T-HS for guix-patches@gnu.org; Wed, 07 Feb 2024 16:34:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rXpZO-0002JY-1i for guix-patches@gnu.org; Wed, 07 Feb 2024 16:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68935] [PATCH 1/3] svn-fetch: Require svn-command argument. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Feb 2024 21:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Herman Rimm Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Ricardo Wurmus , 68935@debbugs.gnu.org, Christopher Baines Received: via spool by 68935-submit@debbugs.gnu.org id=B68935.17073416718855 (code B ref 68935); Wed, 07 Feb 2024 21:35:02 +0000 Received: (at 68935) by debbugs.gnu.org; 7 Feb 2024 21:34:31 +0000 Received: from localhost ([127.0.0.1]:58061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXpYs-0002Ik-MU for submit@debbugs.gnu.org; Wed, 07 Feb 2024 16:34:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXpYr-0002IY-1E for 68935@debbugs.gnu.org; Wed, 07 Feb 2024 16:34:29 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rXpYT-0003ye-Ju; Wed, 07 Feb 2024 16:34:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=tDskGhrJ1Y7Jdp/3nEXj+Z1AKnwTcUoyimmG+jOC6BY=; b=OkZ6lxctdgv/vuWc6UFc UXHpYAfLXlGcAAIQTV7kfE2zYIiebfTmTvM/zZJV6zx7l9QmmJOM7rgpZqwzIcFB6P4pav9bbErof 2vYxb9RtItWGig9lNkF1f5tB8SiBkKHSwUQ7yxU/BdCiN8POeBzSZKYtC6LMPRyxVtXDlZ459ogrY dvpWcUKOms2GkijHblypVQ31RZpHv/M7AxW0dPfz2izJtFfpAhQrd/vAiIUCPwbJHR07fd5PaNzty EfR5FDL5JkHyav1iBQeCCo6LHuk5B7UmXw8mZ3Yx5BGsFN000k1oodIrsfs4sRulIVhp59cnnXf7Q XzdquNIwDe4veQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <3a3748ee3fd345ff26bd63979bf8cee2c32d87ab.1707144191.git.herman@rimm.ee> (Herman Rimm's message of "Mon, 5 Feb 2024 16:07:12 +0100") References: <3a3748ee3fd345ff26bd63979bf8cee2c32d87ab.1707144191.git.herman@rimm.ee> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Nonidi 19 =?UTF-8?Q?Pluvi=C3=B4se?= an 232 de la =?UTF-8?Q?R=C3=A9volution,?= jour de la Pulmonaire X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 07 Feb 2024 22:34:01 +0100 Message-ID: <87fry43qnq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Spam-Score: -5.87 X-Migadu-Queue-Id: A274A271EE X-Migadu-Spam-Score: -5.87 X-TUID: NqirEhOV/V7O Hi Herman, Herman Rimm skribis: > * guix/build/svn.scm (svn-fetch): Require svn-command argument. > * guix/svn-download.scm: Pass svn-command to each (svn-fetch). > > Change-Id: Ibc7d3a79e45374588f71ca4d4ac2685c60ff3c00 Usually we write all the entities (procedures, variables, etc.) modified in the commit log to help review. > -(define* (svn-fetch url revision directory > - #:key (svn-command "svn") > - (recursive? #t) > +(define* (svn-fetch url revision directory svn-command > + #:key (recursive? #t) > (user-name #f) > (password #f)) What=E2=80=99s the rationale for this change? It=E2=80=99s a relatively common pattern in Guix build-side code to assume = that commands can be found in $PATH while still providing a way to specify the command=E2=80=99s absolute file name. > (define* (download-svn-to-store store ref > #:optional (name (basename (svn-referenc= e-url ref))) > - #:key (log (current-error-port))) > + #:key (log (current-error-port)) > + (svn (subversion-package))) > "Download from REF, a object to STORE. Write progress > reports to LOG." > (call-with-temporary-directory > (lambda (temp) > (let ((result > (parameterize ((current-output-port log)) > - (build:svn-fetch (svn-reference-url ref) > + (with-imported-modules > + (source-module-closure '((guix build svn) > + (guix build utils))) > + #~(begin > + (use-modules (guix build svn) > + (guix build utils)) > + (svn-fetch (svn-reference-url ref) > (svn-reference-revision ref) > (string-append temp "/svn") > + #+(file-append svn "/bin/svn") > #:user-name (svn-reference-user-name ref) > - #:password (svn-reference-password ref)))= )) > + #:password (svn-reference-password ref)))= )))) > (and result > (add-to-store store name #t "sha256" > (string-append temp "/svn"))))))) This doesn=E2=80=99t have the desired effect: =E2=80=98download-svn-to-stor= e=E2=80=99 will now always return a gexp instead of returning either #f or a store file name. This procedure and =E2=80=98download-multi-svn-to-store=E2=80=99 (used by t= he texlive importer) really expect =E2=80=9Csvn=E2=80=9D to be in $PATH. It cannot re= ally be avoided AFAICS. Thanks, Ludo=E2=80=99.