[debhelper-devel] [debhelper] 01/01: Regression in dh_fixperms causing packages to be non-reproducible

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 8c8de49dc1e11855de241bef59c4eebbc0f4a096
Author: Chris Lamb <lamby at debian.org>
Date:   Sun May 7 13:30:15 2017 +0200

    Regression in dh_fixperms causing packages to be non-reproducible
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 6 ++++++
 dh_fixperms      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d5017e..7d8008e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 debhelper (10.4) UNRELEASED; urgency=medium
 
+  [ Niels Thykier ]
   * meson.pm: Pass --wrap-mode=nodownload to meson (requires meson
     0.40-1 or later).
 
+  [ Chris Lamb ]
+  * dh_fixperms: Fix regression where dh_fixperms would fail to correct
+    permissions because it used an invalid find expression.
+    (Closes: #862003)
+
  -- Niels Thykier <niels at thykier.net>  Sat, 06 May 2017 16:04:36 +0000
 
 debhelper (10.3) experimental; urgency=medium
diff --git a/dh_fixperms b/dh_fixperms
index 0e66a40..16c99eb 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -69,7 +69,7 @@ my @mode_0644_patterns = (
 my @mode_0755_patterns = (
 	# None for Debian
 );
-my $find_exclude_options='';
+my $find_exclude_options='-true';
 if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
 	$find_exclude_options="! \\( $dh{EXCLUDE_FIND} \\)";
 }
@@ -86,7 +86,7 @@ sub find_and_reset_perm {
 	}
 	$dir_string = escape_shell(@dirs);
 	$raw_find_expr //= '';
-	$raw_find_expr_late //= '';
+	$raw_find_expr_late //= '-true';
 	complex_doit("find ${dir_string} ${raw_find_expr} -a ${find_exclude_options} -a ${raw_find_expr_late} -print0",
 		"2>/dev/null | xargs -0r chmod ${mode}");
 }

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