GNU bug report logs - #32287
[PATCH] Reproducible svn checkouts

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32287 in the body.
You can then email your comments to 32287 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Julien Lepiller <julien <at> lepiller.eu>
To: guix-patches <at> gnu.org
Subject: [PATCH] Reproducible svn checkouts
Date: Fri, 27 Jul 2018 12:36:33 +0200

[Message part 1 (text/plain, inline)]

Some svn checkouts have sub-repositories that have their own .svn
folder. These folders contain timestamps, so this patch removes
every .svn folder in the result of the checkout, instead of only the
top-level one.

[0001-guix-svn-Remove-all-.svn-folders.patch (text/x-patch, attachment)]

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

From: ludo <at> gnu.org (Ludovic Courtès)
To: Julien Lepiller <julien <at> lepiller.eu>
Cc: 32287 <at> debbugs.gnu.org
Subject: Re: [bug#32287] [PATCH] Reproducible svn checkouts
Date: Sun, 29 Jul 2018 15:59:03 +0200

Hi Julien,

Julien Lepiller <julien <at> lepiller.eu> skribis:

> Some svn checkouts have sub-repositories that have their own .svn
> folder. These folders contain timestamps, so this patch removes
> every .svn folder in the result of the checkout, instead of only the
> top-level one.

Ouch, good catch.

Did you find packages that would trigger this issue?  We should somehow
check all the packages that use ‘svn-fetch’ when we merge this patch,
and update hashes as needed.

> From 93aa06821d62ba902d6b3fbf5ece0cbb9d9ec797 Mon Sep 17 00:00:00 2001
> From: Julien Lepiller <julien <at> lepiller.eu>
> Date: Fri, 6 Jul 2018 18:32:50 +0200
> Subject: [PATCH] guix: svn: Remove all .svn folders.
>
> * guix/build/svn.scm (svn-fetch): Remove all .svn folders as they contain
> timestamps.
> ---
>  guix/build/svn.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/guix/build/svn.scm b/guix/build/svn.scm
> index 252d1d4ee..41bbfdc87 100644
> --- a/guix/build/svn.scm
> +++ b/guix/build/svn.scm
> @@ -51,7 +51,7 @@ valid Subversion revision.  Return #t on success, #f otherwise."
>    ;; of the repo.  Since we want a fixed output, this directory needs
>    ;; to be taken out.
>    (with-directory-excursion directory
> -    (delete-file-recursively ".svn"))
> +    (for-each delete-file-recursively (find-files "." "\\.svn")))

‘find-files’ doesn’t include directories by default; we also need a
stricter regexp, leading to:

  (for-each delete-file-recursively
            (find-files "." "^\\.svn$" #:directories? #t))

WDYT?

(I’ll be AFK so feel free to apply if it looks good to you.)

Ludo’.

Message #13 received at 32287-done <at> debbugs.gnu.org (full text, mbox):

From: Julien Lepiller <julien <at> lepiller.eu>
To: 32287-done <at> debbugs.gnu.org
Subject: Re: [bug#32287] [PATCH] Reproducible svn checkouts
Date: Sun, 19 Aug 2018 17:52:06 +0200

Le Sun, 29 Jul 2018 15:59:03 +0200,
ludo <at> gnu.org (Ludovic Courtès) a écrit :

> Hi Julien,
> 
> Julien Lepiller <julien <at> lepiller.eu> skribis:
> 
> > Some svn checkouts have sub-repositories that have their own .svn
> > folder. These folders contain timestamps, so this patch removes
> > every .svn folder in the result of the checkout, instead of only the
> > top-level one.  
> 
> Ouch, good catch.
> 
> Did you find packages that would trigger this issue?  We should
> somehow check all the packages that use ‘svn-fetch’ when we merge
> this patch, and update hashes as needed.
> 

No package in Guix trigger this issue, but I have a package definition
for JOSM that does. The patch doesn't change the content of sources
using svn-fetch we have, so there's nothing to worry about.

Pushed as dd1e45335e135fe724acece440782344ef8ca9fd in staging with
your suggestions. And now I wonder why I pushed to staging since it
doesn't change any existing package... too late I guess :)

Thank you!

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

From: Leo Famulari <leo <at> famulari.name>
To: 32287 <at> debbugs.gnu.org, julien <at> lepiller.eu
Subject: Re: bug#32287: [PATCH] Reproducible svn checkouts
Date: Sun, 19 Aug 2018 17:47:38 -0400

[Message part 1 (text/plain, inline)]

On Sun, Aug 19, 2018 at 05:52:06PM +0200, Julien Lepiller wrote:
> Pushed as dd1e45335e135fe724acece440782344ef8ca9fd in staging with
> your suggestions. And now I wonder why I pushed to staging since it
> doesn't change any existing package... too late I guess :)

If you use `git cherry-pick` to apply the commit to the master branch,
Git should do the right thing when staging is eventually merged to
master.

[signature.asc (application/pgp-signature, inline)]

Previous Next

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