[lintian] 01/01: Actually pick the first out of debian/source/lintian-overrides and debian/source.lintian-overrides. Thanks to Thorsten Glaser fo the report. (Closes: #890361)

[Chris Lamb <chris@chris-lamb.co.uk>]

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

lamby pushed a commit to branch master
in repository lintian.

commit b8bea4b6ba77319314045e738fa2df35d099ee0b
Author: Chris Lamb <lamby@debian.org>
Date:   Wed Feb 14 08:39:24 2018 +0000

    Actually pick the first out of debian/source/lintian-overrides and debian/source.lintian-overrides. Thanks to Thorsten Glaser fo the report. (Closes: #890361)
---
 collection/override-file | 1 +
 debian/changelog         | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/collection/override-file b/collection/override-file
index 04c43fc..d93442f 100755
--- a/collection/override-file
+++ b/collection/override-file
@@ -59,6 +59,7 @@ sub collect {
         } elsif (-f "$override.gz") {
             $file = "$override.gz";
         }
+        last if $file;
     }
 
     if (defined $file and not is_ancestor_of("$dir/unpacked", $file)) {
diff --git a/debian/changelog b/debian/changelog
index 5efa227..781934a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,11 @@ lintian (2.5.75) UNRELEASED; urgency=medium
       tarballs that lack a Files-Excluded or Comment header in
       debian/copyright.
 
+  * collection/override-file:
+    + [CL] Actually pick the first out of debian/source/lintian-overrides
+      and debian/source.lintian-overrides. Thanks to Thorsten Glaser for
+      the report.  (Closes: #890361)
+
   * commands/reporting-html-reports.html:
     + [NT] Minimize generated SVG files if scour is installed and
       available in PATH.

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