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

[lintian] 01/01: Add .yml to the list of file extensions to avoid false positives when emitting extra-license-file, with testcase. Thanks to Rene Engelhard for the report. (Closes: #856137)



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

lamby pushed a commit to branch master
in repository lintian.

commit f410d5065abee6011417852493427f4b66a2c6a7
Author: Chris Lamb <lamby@debian.org>
Date:   Wed Jul 12 22:23:14 2017 +0100

    Add .yml to the list of file extensions to avoid false positives when emitting extra-license-file, with testcase. Thanks to Rene Engelhard for the report.  (Closes: #856137)
---
 checks/files.pm                                | 2 +-
 debian/changelog                               | 4 ++++
 t/tests/files-extra-license/debian/bsd.yml     | 1 +
 t/tests/files-extra-license/debian/debian/docs | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/checks/files.pm b/checks/files.pm
index e49bfde..6b594d6 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -1249,7 +1249,7 @@ sub run {
             and not $fname =~ m{ \. (?:
                   # Common "non-license" file extensions...
                    el|[ch]|cc|p[ylmc]|[hu]i|p_hi|html|php|rb|xpm
-                     |png|jpe?g|gif|svg|dtd|mk|lisp
+                     |png|jpe?g|gif|svg|dtd|mk|lisp|yml
                ) \Z}xsm
             and not $fname=~ m,^usr/share/zope/Products/.*\.(?:dtml|pt|cpt)$,
             and not $fname =~ m,/under\S+License\.docbook$,
diff --git a/debian/changelog b/debian/changelog
index 6a96976..016c3d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,10 @@ lintian (2.5.52) UNRELEASED; urgency=medium
       are now in oldstable.
     + [NT] Drop check for depending on multiple versions of tkx as
       tkx does not seem to be in Debian any longer.
+  * checks/files.pm:
+    + [CL] Add .yml to the list of file extensions to avoid false
+      positives when emitting extra-license-file, with testcase. Thanks
+      to Rene Engelhard for the report.  (Closes: #856137)
   * checks/init.d.desc:
     + [CL] Add an example snippet to explain how to prevent emission
       of init.d-script-sourcing-without-test.
diff --git a/t/tests/files-extra-license/debian/bsd.yml b/t/tests/files-extra-license/debian/bsd.yml
new file mode 100644
index 0000000..2360bf6
--- /dev/null
+++ b/t/tests/files-extra-license/debian/bsd.yml
@@ -0,0 +1 @@
+Lintian should NOT pick up this as an extra license file.
diff --git a/t/tests/files-extra-license/debian/debian/docs b/t/tests/files-extra-license/debian/debian/docs
index 9c789d9..7364196 100644
--- a/t/tests/files-extra-license/debian/debian/docs
+++ b/t/tests/files-extra-license/debian/debian/docs
@@ -1 +1,2 @@
 license*
+bsd.yml

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


Reply to: