[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/02: List all files violating source-includes-file-in-files-excluded, not just the first one we encounter per "Files-Excluded" entry.



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

lamby pushed a commit to branch master
in repository lintian.

commit 12f655712c290a75ce825c7ddc8cfa82de1e473d
Author: Chris Lamb <lamby@debian.org>
Date:   Thu Dec 7 11:17:29 2017 +0000

    List all files violating source-includes-file-in-files-excluded, not just the first one we encounter per "Files-Excluded" entry.
---
 checks/source-copyright.pm                          | 6 ++----
 debian/changelog                                    | 2 ++
 t/tests/source-copyright-source-files-excluded/tags | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index a639ec4..570a72e 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -633,10 +633,8 @@ sub check_files_excluded {
         }
         for my $srcfile (@files) {
             next if $srcfile =~ m/^debian\//;
-            if ($srcfile =~ qr/^$wc_value/) {
-                tag 'source-includes-file-in-files-excluded',$srcfile;
-                last;
-            }
+            tag 'source-includes-file-in-files-excluded', $srcfile
+                if $srcfile =~ qr/^$wc_value/;
         }
     }
 
diff --git a/debian/changelog b/debian/changelog
index b874aef..4afc99c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ lintian (2.5.62) UNRELEASED; urgency=medium
       "source-includes-file-in-files-excluded" tag where we would warn when
       the maintainer has removed upstream's debian/ directory and then we
       would trigger it on the maintainer's replacement files.
+    + [CL] List all files violating source-includes-file-in-files-excluded,
+      not just the first one we encounter per "Files-Excluded" entry.
 
   * data/spelling/corrections:
     + [AB] Remove "publically". It's a seldom, but valid English word
diff --git a/t/tests/source-copyright-source-files-excluded/tags b/t/tests/source-copyright-source-files-excluded/tags
index 1ffaeb9..e0dcc06 100644
--- a/t/tests/source-copyright-source-files-excluded/tags
+++ b/t/tests/source-copyright-source-files-excluded/tags
@@ -1,4 +1,5 @@
 E: source-copyright-source-files-excluded source: source-includes-file-in-files-excluded .matches
 E: source-copyright-source-files-excluded source: source-includes-file-in-files-excluded exclude-dir-2/filename
 E: source-copyright-source-files-excluded source: source-includes-file-in-files-excluded exclude-dir/filename
+E: source-copyright-source-files-excluded source: source-includes-file-in-files-excluded exclude-dir/filename-2
 E: source-copyright-source-files-excluded source: source-includes-file-in-files-excluded exclude-this

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


Reply to: