GNU bug report logs - #69328
[PATCH 00/12] Better source code recovery from SWH

Previous Next

Full log

Message #53 received at 69328 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Timothy Sample <samplet <at> ngyro.com>
Cc: Josselin Poiret <dev <at> jpoiret.xyz>, 69328 <at> debbugs.gnu.org,
 Simon Tournier <zimon.toutoune <at> gmail.com>, Mathieu Othacehe <othacehe <at> gnu.org>,
 Tobias Geerinckx-Rice <me <at> tobias.gr>, Ricardo Wurmus <rekado <at> elephly.net>,
 Christopher Baines <guix <at> cbaines.net>
Subject: Re: [bug#69328] [PATCH 12/12] download: Honor
 ‘GUIX_DOWNLOAD_SEQUENCE’ environment
 variable.
Date: Tue, 05 Mar 2024 11:26:03 +0100

Timothy Sample <samplet <at> ngyro.com> skribis:

> Ludovic Courtès <ludo <at> gnu.org> writes:
>
>> diff --git a/guix/scripts/perform-download.scm b/guix/scripts/perform-download.scm
>> index b96959a09e..250b1c2b48 100644
>> --- a/guix/scripts/perform-download.scm
>> +++ b/guix/scripts/perform-download.scm
>> @@ -114,14 +120,16 @@ (define* (perform-git-download drv output
>>        ;; on ambient authority, hence the PATH value below.
>>        (setenv "PATH" "/run/current-system/profile/bin:/bin:/usr/bin")
>>  
>> -      ;; Note: When doing a '--check' build, DRV-OUTPUT and OUTPUT are
>> -      ;; different, hence the #:item argument below.
>> -      (git-fetch-with-fallback url commit output
>> -                               #:hash hash
>> -                               #:hash-algorithm algo
>> -                               #:recursive? recursive?
>> -                               #:item (derivation-output-path drv-output)
>> -                               #:git-command %git))))
>> +      (parameterize ((%download-sequence
>> +                      (and download-sequence
>> +                           (call-with-input-string download-sequence
>> +                             read))))
>> +        (git-fetch-with-fallback url commit output
>> +                                 #:hash hash
>> +                                 #:hash-algorithm algo
>> +                                 #:recursive? recursive?
>> +                                 #:item (derivation-output-path drv-output)
>> +                                 #:git-command %git)))))
>
> Did you mean to delete the comment here?

Nope, good catch!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.