From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42382)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fdBwk-0006oU-RJ
	for guix-patches@gnu.org; Wed, 11 Jul 2018 06:02:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fdBwg-0002qa-Vr
	for guix-patches@gnu.org; Wed, 11 Jul 2018 06:02:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:46832)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fdBwg-0002qR-QV
	for guix-patches@gnu.org; Wed, 11 Jul 2018 06:02:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fdBwg-0007Ci-BL
	for guix-patches@gnu.org; Wed, 11 Jul 2018 06:02:02 -0400
Subject: [bug#32094] [PATCH] git: Call 'url-cache-directory' outside
	'update-cached-checkout' body.
Resent-Message-ID: <handler.32094.B32094.153130331827683@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
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>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Oleg Pykhalov <go.wigust@gmail.com>
Cc: 32094@debbugs.gnu.org

Hi Oleg,

Oleg Pykhalov <go.wigust@gmail.com> skribis:

> ludo@gnu.org (Ludovic Court=C3=A8s) writes:
>
>> Oleg Pykhalov <go.wigust@gmail.com> 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.