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

[lintian] 01/01: Correct another false positive in the "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.



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

lamby pushed a commit to branch master
in repository lintian.

commit e3936f6664362b4d71504b82bec1485cee736a01
Author: Chris Lamb <lamby@debian.org>
Date:   Thu Dec 7 10:17:37 2017 +0000

    Correct another false positive in the "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.
---
 checks/source-copyright.pm                                            | 1 +
 debian/changelog                                                      | 4 ++++
 .../source-copyright-source-files-excluded/debian/debian/copyright    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index 7ee9c8a..a639ec4 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -632,6 +632,7 @@ sub check_files_excluded {
             $wc_value = qr/^${wc_value}(?:\/|$)/;
         }
         for my $srcfile (@files) {
+            next if $srcfile =~ m/^debian\//;
             if ($srcfile =~ qr/^$wc_value/) {
                 tag 'source-includes-file-in-files-excluded',$srcfile;
                 last;
diff --git a/debian/changelog b/debian/changelog
index 01b72cc..b874aef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ lintian (2.5.62) UNRELEASED; urgency=medium
     + [CL] Correct false positives in the
       "source-includes-file-in-files-excluded" tag where a Files-Excluded
       of "lib/*" would be triggered for "foolib/filename".
+    + [CL] Correct another false positive in the
+      "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.
 
   * data/spelling/corrections:
     + [AB] Remove "publically". It's a seldom, but valid English word
diff --git a/t/tests/source-copyright-source-files-excluded/debian/debian/copyright b/t/tests/source-copyright-source-files-excluded/debian/debian/copyright
index 9864c95..7b29b6b 100644
--- a/t/tests/source-copyright-source-files-excluded/debian/debian/copyright
+++ b/t/tests/source-copyright-source-files-excluded/debian/debian/copyright
@@ -6,6 +6,8 @@ Files-Excluded: exclude-this
  .*
  */js/jquery.js
  lib/*
+ debian/*
+ debian/copyright
 
 Files: *
 Copyright: 2011 J. Random Hacker <j.r.hacker@example.com>

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


Reply to: