[Reproducible-commits] [debhelper] 01/02: dh_usrlocal: output dir list in a stable order

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository debhelper.

commit 0d4aa3469e26dd9b6a7e1457513ff019886e3368
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Jan 10 10:11:31 2015 +0000

    dh_usrlocal: output dir list in a stable order
    
    We now sort the directory lists in order to guarantee a stable output.
    This was preventing some packages to build reproducibly.
    
    Closes: #775020
---
 dh_usrlocal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dh_usrlocal b/dh_usrlocal
index 4ccc601..b395dc6 100755
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -101,9 +101,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		my $ebs = $bs x 2; # Escape the backslash from the shell
 		# This constructs the body of a 'sed' c\ expression which
 		# is parsed by the shell in double-quotes
-		my $dirs = join("$ebs\n", @dirs);
+		my $dirs = join("$ebs\n", sort @dirs);
 		pop @justdirs; # don't remove directories directly in /usr/local
-		my $justdirs = join("$ebs\n", @justdirs);
+		my $justdirs = join("$ebs\n", sort @justdirs);
 		if (! $dh{NOSCRIPTS}) { 
 			autoscript($package,"postinst", "postinst-usrlocal",
 				   "/#DIRS#/ c${ebs}\n${dirs}");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debhelper.git