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

[lintian] 01/01: checks/files.pm: Really fix extra-license checks. Thanks again, mapreri. :)



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

lamby pushed a commit to branch master
in repository lintian.

commit 4199e3735bcbe03a5e5990c8de5f1f3ed7ab6867
Author: Chris Lamb <lamby@debian.org>
Date:   Mon Jan 1 14:56:30 2018 +0000

    checks/files.pm: Really fix extra-license checks. Thanks again, mapreri. :)
---
 checks/files.pm                                                       | 4 ++--
 .../debian/_sources/{LICENSE.txt.rst => LICENSE.rst.txt}              | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/checks/files.pm b/checks/files.pm
index 36da75c..f14feb6 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -1305,8 +1305,8 @@ sub run {
             # base-files (which is required to ship them)
             and not $fname =~ m,^usr/share/common-licenses/[^/]+$,o
             and not defined $link
-            # Sphinx includes license files
-            and not $fname =~ m,/_sources/license\.txt(\.rst)?$,oi
+            # Sphinx includes various license files
+            and not $fname =~ m,/_sources/license(\.rst)?\.txt$,oi
           ) {
 
             # okay, we cannot rule it out based on file name; but if
diff --git a/t/tests/files-extra-license/debian/_sources/LICENSE.txt.rst b/t/tests/files-extra-license/debian/_sources/LICENSE.rst.txt
similarity index 100%
rename from t/tests/files-extra-license/debian/_sources/LICENSE.txt.rst
rename to t/tests/files-extra-license/debian/_sources/LICENSE.rst.txt

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


Reply to: