[debhelper-devel] [debhelper] 01/01: dh_installchangelogs: Don't use a directory as a changelog

[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 a56c24536661bd60152bd87a50a5568942421cf8
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jun 24 14:30:05 2017 +0000

    dh_installchangelogs: Don't use a directory as a changelog
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog     | 3 +++
 dh_installchangelogs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d34b218..579e781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ debhelper (10.5) UNRELEASED; urgency=medium
     PerlIO-gzip bug RT#114557.
   * Dh_Lib.pm: Ignore empty dpkg-architecture variables.
     (Closes: #862844)
+  * dh_installchangelogs: Avoid trying to install a directory by default
+    as a changelog file.  Thanks to Markus Koschany for reporting the
+    issue.  (Closes: #861852)
 
   [ Iain Lane ]
   * Dh_Lib: Re-add warning + exit 0 for the -i/-a shortcut that was
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 02c0495..acfdc9b 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -146,7 +146,7 @@ if (! defined $upstream) {
 			foreach my $suffix ('', qw(.txt .md .rst)) {
 				foreach my $name (qw{changelog changes history}) {
 					my @matches=grep {
-						lc basename($_) eq "$name$suffix" && -s $_ && ! excludefile($_)
+						lc basename($_) eq "$name$suffix" && -f $_ && -s _ && ! excludefile($_)
 					} @files;
 					if (@matches) {
 						$upstream=shift @matches;

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