bug#36242: Repacked source checkouts get a misleading file name

[Marius Bakke <mbakke@fastmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2362 bytes --]

Efraim Flashner <efraim@flashner.co.il> writes:

> On Sun, Jun 16, 2019 at 11:04:26AM +0200, Marius Bakke wrote:
>> Hello,
>> 
>> When repacking a source checkout (e.g. by using git-fetch with a
>> snippet), the generated file name contains only the first two version
>> identifiers.
>> 
>> E.g. `guix build -S eudev` returns
>> 
>> /gnu/store/7lgsxmr0rk9f8fbq6k0kj1aqb7lnrlll-eudev-3.2.tar.xz
>> 
>> ...even though it should be "3.2.8".
>> 
>> This patch fixes it:
>> 
>
>> From 0c44561d0d45de91f4674d659b86d740642ae801 Mon Sep 17 00:00:00 2001
>> From: Marius Bakke <mbakke@fastmail.com>
>> Date: Sun, 16 Jun 2019 10:50:15 +0200
>> Subject: [PATCH] packages: Keep full version in file name when repacking
>>  source checkouts.
>> 
>> * guix/packages.scm (patch-and-repack): If ORIGINAL-FILE-NAME is a source
>> checkout, drop the '-checkout' part so the version-detecting code works.
>> ---
>>  guix/packages.scm | 12 +++++++++---
>>  1 file changed, 9 insertions(+), 3 deletions(-)
>> 
>> diff --git a/guix/packages.scm b/guix/packages.scm
>> index c94a651f27..5b8969e079 100644
>> --- a/guix/packages.scm
>> +++ b/guix/packages.scm
>> @@ -505,11 +505,17 @@ specifies modules in scope when evaluating SNIPPET."
>>      (and=> (file-extension file-name)
>>             (cut string-every char-set:hex-digit <>)))
>>  
>> +  (define (checkout? directory)
>> +    ;; Return true if DIRECTORY is a checkout (git, svn, etc).
>> +    (string-suffix? "-checkout" directory))
>> +
>>    (define (tarxz-name file-name)
>>      ;; Return a '.tar.xz' file name based on FILE-NAME.
>> -    (let ((base (if (numeric-extension? file-name)
>> -                    original-file-name
>> -                    (file-sans-extension file-name))))
>> +    (let ((base (cond ((numeric-extension? file-name)
>> +                       original-file-name)
>> +                      ((checkout? file-name)
>> +                       (string-drop-right file-name 9))
>> +                      (else (file-sans-extension file-name)))))
>>        (string-append base
>>                       (if (equal? (file-extension base) "tar")
>>                           ".xz"
>> -- 
>> 2.22.0
>> 
>
> Pinging Mark and Ludo, similar to https://issues.guix.info/issue/34066

Whoops, was not aware of that report!  Closing as duplicate.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]