[debhelper-devel] [debhelper] 01/01: dh_installman: Fix regression in compat 5

[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 4c063c99c3c2967491a6e465d0abc9e0762197b4
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jun 28 13:47:06 2017 +0000

    dh_installman: Fix regression in compat 5
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_installman    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eb2d22a..849ecaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ debhelper (10.6) UNRELEASED; urgency=medium
     Note that dh_installdocs is not a complete noop in this case
     as it still ensures the package has a copyright file (or a
     symlinked doc directory).  (Closes: #865869)
+  * dh_installman: Fix regression in compat 5 that could make it
+    ignore one manpage per invocation.
 
  -- Niels Thykier <niels at thykier.net>  Tue, 27 Jun 2017 17:29:32 +0000
 
diff --git a/dh_installman b/dh_installman
index 17c7633..f1ad517 100755
--- a/dh_installman
+++ b/dh_installman
@@ -208,7 +208,7 @@ on_items_in_parallel(\@all_packages, sub {
 			my $instpage = "$destdir$instname.$section";
 
 			next if -l $instpage;
-			next if compat(5) && -e _;
+			next if -e _ && compat(5);
 
 			install_dir($destdir);
 			if ($gz) {

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