bin/dh_strip_nondeterminism

@@ -45,7 +45,7 @@ things to exclude.
 
 init();
 
-my @nondeterministic_files;
+my (@nondeterministic_files, %seen);
 
 sub testfile {
 	return if -l $_ or -d $_; # Skip directories and symlinks always.
@@ -57,6 +57,11 @@ sub testfile {
 		return if ($fn=~m/\Q$f\E/);
 	}
 
+	# Deduplicate hardlinks to avoid issues under parallelism
+	my ($dev, $inode, undef, $nlink) = stat($_);
+	return if defined $nlink && $nlink > 1 && $seen{"$inode.$dev"};
+	$seen{"$inode.$dev"} = 1;
+
 	my $normalizer = File::StripNondeterminism::get_normalizer_for_file($_);
 	if ($normalizer) {
 		push @nondeterministic_files, [$fn, $normalizer];

debian/changelog

+strip-nondeterminism (1.1.1-1) unstable; urgency=medium
+
+  * dh_strip_nondeterminism: Deduplicate hardlinks via stat(2) to avoid issues
+    when processing files in parallel.
+
+    As strip-nondeterminism's handlers are not currently guaranteed to be
+    atomic, one process can temporarily truncate a file which can cause errors
+    in other threads processing the "same" file under a unique pathname. This
+    was causing a FTBFS in packages that deduplicate hardlinks in their build
+    process (eg. src:debian-handbook). (Closes: #922168)
+
+ -- Chris Lamb <lamby@debian.org>  Wed, 13 Feb 2019 09:31:59 +0100
+
 strip-nondeterminism (1.1.0-1) unstable; urgency=medium
 
   [ Holger Levsen ]

lib/File/StripNondeterminism.pm

@@ -25,7 +25,7 @@ use POSIX qw(tzset);
 
 our($VERSION, $canonical_time, $clamp_time);
 
-$VERSION = '1.1.0'; # <https://semver.org/>
+$VERSION = '1.1.1'; # <https://semver.org/>
 
 sub init() {
 	$ENV{'TZ'} = 'UTC';

t/fixtures.t

@@ -72,7 +72,7 @@ foreach my $filename (@fixtures) {
 		$normalizer->($in) if defined $normalizer;
 		my @stat_after = lstat $in;
 
-		ok(compare($in, $out) == 0, "Got expected output");
+		ok(compare($in, $out) == 0, "Test output $in matched expected $out");
 
 		# Check that file attributes remain unchanged.
 		foreach my $i (sort keys %STAT) {