[libconfig-model-dpkg-perl] 09/23: scanner: ignore some debian files

[dod at debian.org]

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

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit d082d63016deb7b3684de1e14a8603c11b715acf
Author: Dominique Dumont <dod at debian.org>
Date:   Tue Jan 24 13:49:09 2017 +0100

    scanner: ignore some debian files
---
 lib/Dpkg/Copyright/Scanner.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 173eef5..608cb8a 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -105,7 +105,9 @@ $default{ignore}= << 'EOR';
 (?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$|
 # File or directory names that should be ignored
 (?:^|/)(?:CVS|RCS|\.pc|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|
-\.shelf|_MTN|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
+\.shelf|_MTN|\.bzr(?:\.backup|tags)?)(?:$|/.*$)|
+# skip debian files that are too confusing or too short
+(?:^|/)debian/((fix.scanned.)?copyright|changelog|NEWS|compat|.*yml|docs|source|patches/series)
 EOR
 
 # also from licensecheck
@@ -213,12 +215,14 @@ sub scan_files ( %args ) {
     foreach my $line (sort @lines) {
         chomp $line;
         # say "found: $line";
-        my ($f,$l,$c) = split /\t/, $line; 
+        my ($f,$l,$c) = split /\t/, $line;
         $f =~ s!\./!!;
-        next if $f =~ m!debian/(copyright|changelog)$!; # too confusing
         next if $files->{$f}; # file already parsed
-        if ($regexps{check} and $f !~ $regexps{check}) {
-            push @skipped, $f if $regexps{ignore} and $f !~ $regexps{ignore};
+
+        # filter out files user does not want checked
+        if ( $f !~ $regexps{check} ) {
+            # the ignore test should not be usefull as the files are ignored by licensecheck
+            push @skipped, $f unless $f =~ $regexps{ignore};
             next;
         }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git