From unknown Sat Jun 21 03:19:11 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#32094 <32094@debbugs.gnu.org> To: bug#32094 <32094@debbugs.gnu.org> Subject: Status: [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body. Reply-To: bug#32094 <32094@debbugs.gnu.org> Date: Sat, 21 Jun 2025 10:19:11 +0000 retitle 32094 [PATCH] git: Call 'url-cache-directory' outside 'update-cache= d-checkout' body. reassign 32094 guix-patches submitter 32094 Oleg Pykhalov severity 32094 normal tag 32094 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 06:19:53 2018 Received: (at submit) by debbugs.gnu.org; 8 Jul 2018 10:19:53 +0000 Received: from localhost ([127.0.0.1]:50677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fc6nJ-0008N2-KV for submit@debbugs.gnu.org; Sun, 08 Jul 2018 06:19:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fc6nI-0008Mq-Em for submit@debbugs.gnu.org; Sun, 08 Jul 2018 06:19:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fc6nC-0004uq-C6 for submit@debbugs.gnu.org; Sun, 08 Jul 2018 06:19:47 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fc6nC-0004uh-8K for submit@debbugs.gnu.org; Sun, 08 Jul 2018 06:19:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fc6nB-0001QR-8h for guix-patches@gnu.org; Sun, 08 Jul 2018 06:19:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fc6n8-0004tR-1o for guix-patches@gnu.org; Sun, 08 Jul 2018 06:19:45 -0400 Received: from mail-lf0-x235.google.com ([2a00:1450:4010:c07::235]:44255) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fc6n7-0004sz-Or for guix-patches@gnu.org; Sun, 08 Jul 2018 06:19:41 -0400 Received: by mail-lf0-x235.google.com with SMTP id g6-v6so2302231lfb.11 for ; Sun, 08 Jul 2018 03:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WA/bBm0xRGSYF2AV7/G3Ybgfi4MqsQkV89E3x33nfW0=; b=OFQyZDWtKFf/gdoTpimiT2XS3ocFQf0a4zs751nZok/eWNKrnlVy39cReFPE8E91SR M/VOd9Z+anrFKxsDQDpXESELSCbYkDPM+7m8lWqH9ukEr7+scXiwJfTepNu77vr9K/ME hO4JK72WTTS1XJk25AYOmzkb2ozp+Ng9sN7Mo+y9DoWNAyNo9gGnlST5lIfbFDuy0PMU 9jjzdqmYC87SccX0FIWWWD6/BxVGq5DYZH8TD+o5AMenmko3B3VcADRCAIzfKRxz3VNz gIRVLEAiDHEVHo7NLw7VkmYXuPmJydA9Vki4ZsuUmjf5RzXzITeC9iE9qU7UAd6WTy5s D/eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WA/bBm0xRGSYF2AV7/G3Ybgfi4MqsQkV89E3x33nfW0=; b=ehMBzU7Zjy77eHp5j6shG1PwHiBZYNSMxAYeVnxn0+awfAc2JUifMg3VSU6jxqdB2y gSdhoWJzqw5/KRMEdzt9APpBUw6uNZ7TdpioBJbkQFBtezoT7q9FHS8yW3K5M687IXpC BUEXdDxPT2+PvN/dg/Kzd04fDomAABvuqN7TVktJlBQ9sHkMATcOg7KpcCu8jU87Qfns 7JLA3hMWe8mWdMgtbnlGA6PafSI9JmZtAd/y5h9E+emCEuD+FYqL5N4VALkknGjsTn9W JVZci42/xROT6uOAZ6Ubn2q3XW5aq9A6v6UAfH38EKYZLpZ/v9DdcMpF0hUD8mnmCM4C 8gtw== X-Gm-Message-State: APt69E3vm/DPzY6J6MiWmtVk6lTeztFgIjl7GssMXH5x5GtVB0LpsPXf bzJ3BpkwOnMLTjz+dDPyOw4Ekw== X-Google-Smtp-Source: AAOMgpc5bZN6QSMhrKjddDbil/zPU2ihd0RPfLSoVB3XC3k/IqqW/LQg1DCm8aIIfynwO9Vwxn1Gzw== X-Received: by 2002:a19:4ecd:: with SMTP id u74-v6mr11203176lfk.57.1531045179783; Sun, 08 Jul 2018 03:19:39 -0700 (PDT) Received: from localhost.localdomain ([178.71.61.57]) by smtp.gmail.com with ESMTPSA id b14-v6sm2902070lfa.62.2018.07.08.03.19.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 03:19:39 -0700 (PDT) From: Oleg Pykhalov To: guix-patches@gnu.org Subject: [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body. Date: Sun, 8 Jul 2018 13:19:35 +0300 Message-Id: <20180708101935.7292-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Oleg Pykhalov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) * guix/git.scm (update-cached-checkout): Call 'url-cache-directory' in 'cache-directory' key argument. --- guix/git.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 9e89cc006..c5912170b 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -114,7 +114,8 @@ OID (roughly the commit hash) corresponding to REF." #:key (ref '(branch . "origin/master")) (cache-directory - (%repository-cache-directory))) + (url-cache-directory + (%repository-cache-directory)))) "Update the cached checkout of URL to REF in CACHE-DIRECTORY. Return two values: the cache directory name, and the SHA1 commit (a string) corresponding to REF. @@ -122,11 +123,10 @@ to REF. REF is pair whose key is [branch | commit | tag] and value the associated data, respectively [ | | ]." (with-libgit2 - (let* ((cache-dir (url-cache-directory url cache-directory)) - (cache-exists? (openable-repository? cache-dir)) + (let* ((cache-exists? (openable-repository? cache-directory)) (repository (if cache-exists? - (repository-open cache-dir) - (clone* url cache-dir)))) + (repository-open cache-directory) + (clone* url cache-directory)))) ;; Only fetch remote if it has not been cloned just before. (when cache-exists? (remote-fetch (remote-lookup repository "origin"))) @@ -138,7 +138,7 @@ data, respectively [ | | ]." 'repository-close!) (repository-close! repository)) - (values cache-dir (oid->string oid)))))) + (values cache-directory (oid->string oid)))))) (define* (latest-repository-commit store url #:key -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 06:25:00 2018 Received: (at 32094) by debbugs.gnu.org; 8 Jul 2018 10:25:00 +0000 Received: from localhost ([127.0.0.1]:50682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fc6sG-0008V5-82 for submit@debbugs.gnu.org; Sun, 08 Jul 2018 06:25:00 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:41556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fc6sE-0008Us-N8 for 32094@debbugs.gnu.org; Sun, 08 Jul 2018 06:24:59 -0400 Received: by mail-lj1-f194.google.com with SMTP id y17-v6so7233353ljy.8 for <32094@debbugs.gnu.org>; Sun, 08 Jul 2018 03:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=CL4EIVY48FEUYsLrKaO41Qxqk4O7usfXY8NvG5WoF0E=; b=lyoIMgzPrCf1/FGBNSgu1F4jKI1WbaXJuWpJpAIlmi01lsIVxNPdCnEdWK9g9g9kSl wUKH0wFzLjAqkkk5r40F3sQbJBsb5h9O3RSGDqGUEo5sEfvcvnpSGXmDazvppwM86vdG qMJrSff1zoJNIC8B+vueeeMPl6MP4X1TMJ6U7ei2JZt3h3j4Ko1iXD9jJTAjAnA0aapE LMGEc4AlBIkFtzaHe2UVQ2M/0WleuYHqcdYuCcRmWofueSspcL7WgRp8PqyVZtnD5w0z OQNPmL6ClYHImoC/1mfGQDzk+pgEiTqF2ok7SGhaIO4n4Xu8SxON7WQwUjRwHS1h8TMw zDmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=CL4EIVY48FEUYsLrKaO41Qxqk4O7usfXY8NvG5WoF0E=; b=UT6PH1PUWhbbQLveDQoEQfzmDD2tTgZ4+6y5qMNNzvBNfG6I5NNF1Oc0Bm2Wx/wHWk eSbTueoeH1g06y4LQDFLoc//54Q7AUOSzOWAHRXv8ZXV6Lm2giEvCQYYZazRChxTLuij wuEuWrt/Wi96Hzm3APnC0o5BlkP2Mle2TjuSgmSO0LjkGUGq+XxiM94cA5ro4/inGXLq uKdVlGm5G0JQgxgfxa5p9RDDigmfQmwqyeeJLBIHN3OzqFmDF1hEMbTXuTB/rD/PkoNv zCPwMdnkrHXJ7Y0x4t4vTUbr93djqmXS4VtwiSA4nSWh+cpCIIWYtWboJg9S7+Gk87Rb 1CFg== X-Gm-Message-State: APt69E2Bd/24ylgAjg7jA4Yov/ZI7H2SHqua1cz6UnQRpJ7ydYhWSFEc 6xXbHvGq1up1701IXKInjBLYcw== X-Google-Smtp-Source: AAOMgpdZ1x3Ph+OLqksLiE72PqRAge+X+4cux4uu1p9QfDD1qJJ+U0wDht2CUw9t4QppS0dvMOmerw== X-Received: by 2002:a2e:350b:: with SMTP id z11-v6mr10191314ljz.55.1531045492416; Sun, 08 Jul 2018 03:24:52 -0700 (PDT) Received: from magnolia ([178.71.61.57]) by smtp.gmail.com with ESMTPSA id l3-v6sm1855855lfi.36.2018.07.08.03.24.51 for <32094@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 08 Jul 2018 03:24:51 -0700 (PDT) From: Oleg Pykhalov To: 32094@debbugs.gnu.org Subject: Re: [bug#32094] [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body. References: <20180708101935.7292-1-go.wigust@gmail.com> Date: Sun, 08 Jul 2018 13:24:48 +0300 In-Reply-To: <20180708101935.7292-1-go.wigust@gmail.com> (Oleg Pykhalov's message of "Sun, 8 Jul 2018 13:19:35 +0300") Message-ID: <87va9qhvnz.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32094 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Hello Guix, I want this change to use 'url-cache-directory' with a custom named cache directory. Without the patch cache directory will be renamed by 'url-cache-directory' procedure. Thanks, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEc+OyAXw1EaDPCmAPckbhHGm3lWkFAltB5nAACgkQckbhHGm3 lWlrAhAAlFYwasLJZRugteGW4p3/RrVErECEAS1XP8eYAPKB+PCLK31hUDKe+KDS ZX3TqZcGQlr7bVK6xw2nHZC0kvU3MRKTGG4Q4jzDnQncI936LpaWJ+aIV9CZ65qm E47HCMOOJRt+32iTcvb+ZxaKT6nuQ/OajcXO2pGa7+XVAabifXQnJEzcDpbtRoet PGp37TKFyb1yJRPzooBzq6vHTtZymVZLKX13jVqCmxwBxeUPgxUJmJh3iJHtP2i/ GnnAhP97Yk0IWHQRezGT+TUv9dmN+9J4sp+GbFUzJpa4vbwTIMFVc2zfgchL0216 y843HfONdzhQEHJOonuueahPHGvM1Gfg3n2EwuwaCAISeX141IQ5VxMijQ1Nqmao NJxiEPxly3y01T7jXPjCCNPb8aFhHrW6fIEwAzWEBWDurL4Sq8yifket8mqcElFv Ii1blfcOiPXZ096ErM/CdyiOks7MH4JumotC5CIWSjthnuCMIIZs38XrG35nVozx 7rwYbSPoMYu7eE/nlr2Ner5MMSJRWsRr4I+TLEfsd1DnJsqnGvVRf+zuTKm7/rMd RDAFo+J8rOnPOp5Sf+SnAAsQfoxyrHdCbLAex6NU83udngJ/yq3WprqytNhRocqX 0xZRj715ClDrPFNTCD8tQEXc7nEGve/G1MdEPEuunmuCQiL1wkM= =FT+D -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 09 10:43:14 2018 Received: (at 32094) by debbugs.gnu.org; 9 Jul 2018 14:43:14 +0000 Received: from localhost ([127.0.0.1]:52567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcXNi-0007zq-9F for submit@debbugs.gnu.org; Mon, 09 Jul 2018 10:43:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcXNh-0007zc-My for 32094@debbugs.gnu.org; Mon, 09 Jul 2018 10:43:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcXNY-0004ot-K9 for 32094@debbugs.gnu.org; Mon, 09 Jul 2018 10:43:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcXNY-0004op-Gq; Mon, 09 Jul 2018 10:43:04 -0400 Received: from [193.50.110.150] (port=58774 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fcXNY-0007XL-2t; Mon, 09 Jul 2018 10:43:04 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Oleg Pykhalov Subject: Re: [bug#32094] [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body. References: <20180708101935.7292-1-go.wigust@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 21 Messidor an 226 de la =?utf-8?Q?R=C3=A9volution?= 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: Mon, 09 Jul 2018 16:43:02 +0200 In-Reply-To: <20180708101935.7292-1-go.wigust@gmail.com> (Oleg Pykhalov's message of "Sun, 8 Jul 2018 13:19:35 +0300") Message-ID: <87zhz0fp1l.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32094 Cc: 32094@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hi Oleg, Oleg Pykhalov skribis: > * guix/git.scm (update-cached-checkout): Call 'url-cache-directory' in > 'cache-directory' key argument. =E2=80=98latest-repository-commit=E2=80=99 would need to be adjusted accord= ingly. Could you do that and make sure =E2=80=98guix pull=E2=80=99 still behaves t= he same as before? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 09 23:39:36 2018 Received: (at 32094) by debbugs.gnu.org; 10 Jul 2018 03:39:36 +0000 Received: from localhost ([127.0.0.1]:52930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcjV1-0002bM-Pp for submit@debbugs.gnu.org; Mon, 09 Jul 2018 23:39:36 -0400 Received: from mail-lj1-f182.google.com ([209.85.208.182]:41547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcjUz-0002b6-8q for 32094@debbugs.gnu.org; Mon, 09 Jul 2018 23:39:34 -0400 Received: by mail-lj1-f182.google.com with SMTP id y17-v6so10830071ljy.8 for <32094@debbugs.gnu.org>; Mon, 09 Jul 2018 20:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=8OM4+tEWCbumvwZDcmNGxIL2BeGcPEwVlUBELAyAXDA=; b=nFHcARRDDeduQSGCV+Fe5HOyHnBJSaLtEwwPx662Dt8dWJjV4PCHTvBSUcaYZQn/UB 9THmZlLLXaJTCeLOdabr99u84uxip0OjSECVgVfDbJT5RBvyMpmK4fM7iU2wFBVTFgTV KHttZDbetl4rFO5vaTgaDRsJXXSKh+yzolvnh0wrZ/OPWcEfPB9fJ2S0Ck5oC+rv7l1q /4niaV+pwZQ3y6i7m4Upyorpq5U4CU6BR61FQSSyDW0m7mwCd6MdePQhAo8scVq5VDmu U/LRtSwQzPI2wm+icMKvJal0BvBWpsIVOF3HDNSikf4YHkkM41uqMEqSK6jA9F9QC+s0 hmAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=8OM4+tEWCbumvwZDcmNGxIL2BeGcPEwVlUBELAyAXDA=; b=N7wue9+hl3KE1p/bO+UvW0rmlHipefQZCnrDFlgLBJNiDfOiXjii66G3KqXAKfiIdA hfCb75l3jbS15D4HJ4UBxxiePK9nMM2uGoZPyXR30Qy4rwzaGW2L12RM3Yko+XCBYOih D2eWzAFVvx8lnpcEw79NSlhKn3+SDi/NfkpS9bEtfYVdG6QA1YokPcqVeF3wXb4m0zp7 7F9HiGYRRFbknew6+DGF0odxV7Re6Ny2dwH8hSo+NQ/8tVbRqMKm1a19ee/vYxAonTKl ssAapSVCbMqZ+8J2xjg0jIuBNonK7ocUcPugGsLRJnP4WU5qKiJ36mDEOVPBblfO4Keg 3t4Q== X-Gm-Message-State: APt69E0O4jmkdcdUPnqGTi68HXHbbqUdtuq/12RnDV3XgF112KbBWr/x jtKYGq6k9HGFmG/GGahimUPa1g== X-Google-Smtp-Source: AAOMgpdd26YNhSSunfpEXLQO/ADa984rxTm8/xcNVayP+QdxuuvFt2wt/tDsQwajR+tmNrTT91odqg== X-Received: by 2002:a2e:1984:: with SMTP id 4-v6mr14847876ljz.35.1531193966891; Mon, 09 Jul 2018 20:39:26 -0700 (PDT) Received: from magnolia (92-100-175-88.dynamic.avangarddsl.ru. [92.100.175.88]) by smtp.gmail.com with ESMTPSA id y6-v6sm2527768ljy.42.2018.07.09.20.39.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Jul 2018 20:39:26 -0700 (PDT) From: Oleg Pykhalov To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [bug#32094] [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body. References: <20180708101935.7292-1-go.wigust@gmail.com> <87zhz0fp1l.fsf@gnu.org> Date: Tue, 10 Jul 2018 06:39:22 +0300 In-Reply-To: <87zhz0fp1l.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 09 Jul 2018 16:43:02 +0200") Message-ID: <87efgbiwt1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32094 Cc: 32094@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Ludovic, Thank you for review. ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Oleg Pykhalov skribis: > >> * guix/git.scm (update-cached-checkout): Call 'url-cache-directory' in >> 'cache-directory' key argument. > > =E2=80=98latest-repository-commit=E2=80=99 would need to be adjusted acco= rdingly. > > Could you do that and make sure =E2=80=98guix pull=E2=80=99 still behaves= the same as > before? When I adjusted =E2=80=98latest-repository-commit=E2=80=99 I thought about = removing =E2=80=98url-cache-directory=E2=80=99 call from =E2=80=98update-cached-chec= kout=E2=80=99 instead of moving =E2=80=98url-cache-directory=E2=80=99 call to =E2=80=98cache-directo= ry=E2=80=99 argument. I'm not sure it's possible to call =E2=80=98url-cache-directory=E2=80=99 in= argument of =E2=80=98update-cached-checkout=E2=80=99, because =E2=80=98url-cache-direct= ory=E2=80=99 requires =E2=80=98url=E2=80=99 argument which itself is the argument of =E2=80=98update-cached-checkout=E2= =80=99. (define* (url-cache-directory url #:optional (cache-directory (%repository-cache-directory))) =E2=80=A6) (define* (update-cached-checkout url #:key (ref '(branch . "origin/master")) (cache-directory (%repository-cache-directory))) =E2=80=A6) Here is an updated patch which was successfully tested with =E2=80=98guix p= ull=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-git-Call-url-cache-directory-outside-update-cached-c.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] git: Call 'url-cache-directory' outside From=20b3466c2e8569c30a83e81598657706b3bbbbc282 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 8 Jul 2018 13:15:41 +0300 Subject: [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout'. * guix/git.scm (update-cached-checkout): Remove 'url-cache-directory' call. (latest-repository-commit): Call 'url-cache-directory'. =2D-- guix/git.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 9e89cc006..297b086ad 100644 =2D-- a/guix/git.scm +++ b/guix/git.scm @@ -122,11 +122,10 @@ to REF. REF is pair whose key is [branch | commit | tag] and value the associated data, respectively [ | | ]." (with-libgit2 =2D (let* ((cache-dir (url-cache-directory url cache-directory)) =2D (cache-exists? (openable-repository? cache-dir)) + (let* ((cache-exists? (openable-repository? cache-directory)) (repository (if cache-exists? =2D (repository-open cache-dir) =2D (clone* url cache-dir)))) + (repository-open cache-directory) + (clone* url cache-directory)))) ;; Only fetch remote if it has not been cloned just before. (when cache-exists? (remote-fetch (remote-lookup repository "origin"))) @@ -138,7 +137,7 @@ data, respectively [ | | = ]." 'repository-close!) (repository-close! repository)) =20 =2D (values cache-dir (oid->string oid)))))) + (values cache-directory (oid->string oid)))))) =20 (define* (latest-repository-commit store url #:key @@ -157,12 +156,14 @@ Git repositories are kept in the cache directory spec= ified by (and (string=3D? (basename file) ".git") (eq? 'directory (stat:type stat)))) =20 =2D (let*-values (((checkout commit) =2D (update-cached-checkout url =2D #:ref ref =2D #:cache-directory cache-directo= ry)) =2D ((name) =2D (url+commit->name url commit))) + (let*-values + (((checkout commit) + (update-cached-checkout url + #:ref ref + #:cache-directory + (url-cache-directory url cache-directory))) + ((name) + (url+commit->name url commit))) (values (add-to-store store name #t "sha256" checkout #:select? (negate dot-git?)) commit))) =2D-=20 2.18.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEc+OyAXw1EaDPCmAPckbhHGm3lWkFAltEKmoACgkQckbhHGm3 lWkv0BAAtYI523J5DNoHjh6asqBHc8ddCRVPnUQVA4j8uKYwirsyzxiQSFACToXT xOwjKMceyWPoPnnACeN/5qb8nLVZoJEz0k+2sRsWFwhHXC+z1tpu2ETrFNeVlF0y 6yfEcRrCTgrlO2N9HNb1zs+9Jh2f2XAxcQRKWqH98kghPRF54LyWZD1astChVlD3 B1v+SYpeoZA3HreSdN0hCGXDnu/EBDlJWPkj382pD4zak4NBP/1gaWP/msBJEHBa Gjy3Awk8ivsUsnMjxTbYSyOOdAfkfOK99NKXBI0K1XZcXes/B79HfYRGSjsYj2lE utOHCd8Gm7yfvoMzrT65FG/mHoYTYjBHQueohuHmqXpsY+r4EQPaIj5uze4n8NxJ sERm1+wYTaYBztyZHhNJToSW4gE142F53ttnu+s6w96RoTKDqjTG5dSircWs8D1w MvnDFdGb4M415QMZKPfJ4+JG1YscO01e8LFyeFNAK/8ZKx1hFv1BQCa4j7bsnT40 2L+agZVqJyLwlfdGZ8qEg5GLCXjksRSN/XUwaQcFEhYn0uiwH6qBvpq54107Erfb kqzAlD4N9rVykrgUsDOwJokeTyhx71kpp7Eyf882hcgt4bDNFjKw2yMODZYBz+oA 71TAXtgrS2Luxk4R5aclsXXaHYzjrOhDxNl5qzAI3gmeRxD8Tb4= =hC1g -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 11 06:01:58 2018 Received: (at 32094) by debbugs.gnu.org; 11 Jul 2018 10:01:58 +0000 Received: from localhost ([127.0.0.1]:54729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdBwc-0007CR-Ip for submit@debbugs.gnu.org; Wed, 11 Jul 2018 06:01:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51305) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdBwb-0007CE-AA for 32094@debbugs.gnu.org; Wed, 11 Jul 2018 06:01:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdBwS-0002kq-Af for 32094@debbugs.gnu.org; Wed, 11 Jul 2018 06:01:52 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdBwS-0002kg-6F; Wed, 11 Jul 2018 06:01:48 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=49972 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fdBwR-0002Jz-Jm; Wed, 11 Jul 2018 06:01:47 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Oleg Pykhalov Subject: Re: [bug#32094] [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body. References: <20180708101935.7292-1-go.wigust@gmail.com> <87zhz0fp1l.fsf@gnu.org> <87efgbiwt1.fsf@gmail.com> Date: Wed, 11 Jul 2018 12:01:45 +0200 In-Reply-To: <87efgbiwt1.fsf@gmail.com> (Oleg Pykhalov's message of "Tue, 10 Jul 2018 06:39:22 +0300") Message-ID: <87in5mnl9y.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32094 Cc: 32094@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hi Oleg, Oleg Pykhalov skribis: > ludo@gnu.org (Ludovic Court=C3=A8s) writes: > >> Oleg Pykhalov skribis: >> >>> * guix/git.scm (update-cached-checkout): Call 'url-cache-directory' in >>> 'cache-directory' key argument. >> >> =E2=80=98latest-repository-commit=E2=80=99 would need to be adjusted acc= ordingly. >> >> Could you do that and make sure =E2=80=98guix pull=E2=80=99 still behave= s the same as >> before? > > When I adjusted =E2=80=98latest-repository-commit=E2=80=99 I thought abou= t removing > =E2=80=98url-cache-directory=E2=80=99 call from =E2=80=98update-cached-ch= eckout=E2=80=99 instead of > moving =E2=80=98url-cache-directory=E2=80=99 call to =E2=80=98cache-direc= tory=E2=80=99 argument. > > I'm not sure it's possible to call =E2=80=98url-cache-directory=E2=80=99 = in argument of > =E2=80=98update-cached-checkout=E2=80=99, because =E2=80=98url-cache-dire= ctory=E2=80=99 requires =E2=80=98url=E2=80=99 > argument which itself is the argument of =E2=80=98update-cached-checkout= =E2=80=99. Yes, you can do that: (define* (update-cached-checkout url #:key (ref '(branch . "origin/master")) (cache-directory (url-cache-directory url (%repository-cache-directory)))) =E2=80=A6)=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20 (You=E2=80=99d get a warning about =E2=80=98url=E2=80=99 being unbound if i= t didn=E2=80=99t work.) Could you make this last change? And then I think we=E2=80=99re all set. Thank you, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 13 09:26:41 2018 Received: (at 32094) by debbugs.gnu.org; 13 Jul 2018 13:26:41 +0000 Received: from localhost ([127.0.0.1]:57805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdy5p-0003wY-G3 for submit@debbugs.gnu.org; Fri, 13 Jul 2018 09:26:41 -0400 Received: from mail-lj1-f175.google.com ([209.85.208.175]:33059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdy5n-0003wG-8M; Fri, 13 Jul 2018 09:26:39 -0400 Received: by mail-lj1-f175.google.com with SMTP id t21-v6so24511275lji.0; Fri, 13 Jul 2018 06:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=DHEAi2EMZ0+QcC5wlPSQgNl2YINYJrkVy+JbUZeyDhU=; b=nYJ8t31EtuIikUsYMYKsq+O/FW1lNEOoNZexeIobzZiRaq5OtGBcu8vp91iy1ABCct /YoWTb6JhGInJu1JRXb1E4D8QOkitG+GWtRWVnp0tamUT4KhVtfTIBqFGHA9rTAYG30m vOqYuQEwNS3ZaXxeFIgI5PhMPEoZ5yL6CZkQDWusIy3ShT4qn4sPORwakkr+INQ++I1M 0vW53Hy/nYNO2e4OjqyYYFilbeYYkI17MQ2R8GhepC8t8Hd8ZS/73BZPaqL383jsQx/m IkuLvVUVh6RXLQBQ3FKyaiDcrXSSDmxpg1bcBl8ffpmVnkd4b9sqguXtoCVyCOtaIgyg qd+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=DHEAi2EMZ0+QcC5wlPSQgNl2YINYJrkVy+JbUZeyDhU=; b=c4SVbSs65Y4Y2LAk9HwWpNrkEA5ib7uNtjK3tSxFwYooJXYnWwoAZaXiDLKjz9HXFu uaOidpDYB2OO6nnJ9TB6BPvfrd7AiBENpaaNlWgRIKZy5asZ831+EhBIiFkcwTXUejSQ /qYzXFZoKmysD0i9Smg1qRxfjXCQYOwft2Lb/Jfo7kbQviLz2tmiltrWJVeT5Nrtpht2 9V/Kj9+xUQix3G4yGpPu9aQJpLWQ3akjp13xu1zdQFoqa7cYk+V2pYqXVoHdua5gYOV5 QtH2jLWS6hlexrC4AarnpvJXkTH3P5ryageesAbdsCF8E/uHmK9Y3+NK09CzD2gh8ZQe +zXw== X-Gm-Message-State: AOUpUlGSigGCLzoVSpsFNqkjA0PuJAcyJSasUw7zckUw3h1TVikAmQDF qTQ69eyEYSx3q9TEUrXbb5LcxQ== X-Google-Smtp-Source: AAOMgpeg6DnhL2CZwDtrgkcSBAWeTEPxzc1zGUu4OrL+AmH4KhNZQyTRlRD6lwkA0AUmUiuxCOPxYg== X-Received: by 2002:a2e:8616:: with SMTP id a22-v6mr3574433lji.43.1531488392930; Fri, 13 Jul 2018 06:26:32 -0700 (PDT) Received: from magnolia ([178.71.232.129]) by smtp.gmail.com with ESMTPSA id d75-v6sm6777377lfg.76.2018.07.13.06.26.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 06:26:31 -0700 (PDT) From: Oleg Pykhalov To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [bug#32094] [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body. References: <20180708101935.7292-1-go.wigust@gmail.com> <87zhz0fp1l.fsf@gnu.org> <87efgbiwt1.fsf@gmail.com> <87in5mnl9y.fsf@gnu.org> Date: Fri, 13 Jul 2018 16:26:27 +0300 In-Reply-To: <87in5mnl9y.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Wed, 11 Jul 2018 12:01:45 +0200") Message-ID: <87k1pzgtbw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32094 Cc: 32094@debbugs.gnu.org, 32094-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Ludovic, ludo@gnu.org (Ludovic Court=C3=A8s) writes: [=E2=80=A6] >> I'm not sure it's possible to call =E2=80=98url-cache-directory=E2=80=99= in argument of >> =E2=80=98update-cached-checkout=E2=80=99, because =E2=80=98url-cache-dir= ectory=E2=80=99 requires =E2=80=98url=E2=80=99 >> argument which itself is the argument of =E2=80=98update-cached-checkout= =E2=80=99. > > Yes, you can do that: > > (define* (update-cached-checkout url > #:key > (ref '(branch . "origin/master")) > (cache-directory > (url-cache-directory > url (%repository-cache-directory)))) > =E2=80=A6)=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20 > > (You=E2=80=99d get a warning about =E2=80=98url=E2=80=99 being unbound if= it didn=E2=80=99t work.) Ah, thank you for pointing it out. > Could you make this last change? And then I think we=E2=80=99re all set. OK, added. I tested second time successfully with: =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env env GUIX_PACKAGE_PATH=3D guix pull =2D-8<---------------cut here---------------end--------------->8--- Pushed as ffc3fcade3f7d2c7d26b2fe5245902e6407f9c93 Thanks, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEc+OyAXw1EaDPCmAPckbhHGm3lWkFAltIqIMACgkQckbhHGm3 lWnYcxAAx/QlBMeizG87UiPyWILFmWG29ho2RwCUs/+Y6hzbiK+OjVNazEgloPvG ICXxVzyEtGrKX6nbtJmciXgcJ19vcvJSa+vnsjsz3lFeKEuGpzbt2iiT/O9qV0w+ E+2m2L9/P260WgivK8Ter0wFEONRDG2a5FKVYu0R900QJNUuD3JdPW8tWN2UVrw4 qJNjdnOfePZoJ8wx9MyWdHhGZmHkqUhnmZv2PUawL1ySTt6GjnJqc2jSpJjNIxgt ZOlGh4Jb2kEBy46Omm/84RscLsSii0ueNFKGvvMbgRQiz1ia0+07bibJizfgXcAj DDJE+LGqMEbOz6uB27+Vc52og1ICxjoPe8z3TWKfac0Uh0dviPqa5ycUNm9UxpzU SJVXUuO1sKWSzzIFH7umoyST/jT4gTMngk44JfGi1vNaymBgGTkN7ROnLH2vXClN iuhigyd32ltrhPxCATj0b5nuNGEJqemVH5rL3vnj1sWh5UL7OjXrXaJ7XYnuZCGf e7AtXriTsjKJW1+cQFAAeDRaGrGrmQ8dCRLHLuucK3Yct6RUospkZnx22RGN6jtP Ltmqquv6qLEEkgNgB3Ulm7Pl6wyenHws7kGNDP6FGM293Jt20eIUFyGMzzYC6U9o GOdbbQISs880NQTLvkRrHReaLgb1WgMh49o41DaS4ORhiQZsknA= =mmwu -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 21 03:19:11 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 11 Aug 2018 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator