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

[lintian] 01/01: checks/files.pm: Correct extra-license-check filename matching. Thanks Mattia!



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

lamby pushed a commit to branch master
in repository lintian.

commit b0c92d1d66aed86e4922219a117116d0212966d9
Author: Chris Lamb <lamby@debian.org>
Date:   Mon Jan 1 14:45:13 2018 +0000

    checks/files.pm: Correct extra-license-check filename matching. Thanks Mattia!
---
 checks/files.pm                                                         | 2 +-
 .../debian/_sources/{license.rst => LICENSE.txt.rst}                    | 0
 .../debian/_sources/{license.rst.txt => license.txt}                    | 0
 3 files changed, 1 insertion(+), 1 deletion(-)

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

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


Reply to: