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

[lintian] 01/02: Fix some false positive for undefined license



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

broucaries-guest pushed a commit to branch master
in repository lintian.

commit ceaef9977e4b02a3c5996385463d5de68566333e
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date:   Sun Nov 16 23:36:13 2014 +0100

    Fix some false positive for undefined license
    
    Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
 data/source-copyright/bad-short-licenses           |  7 ++---
 debian/changelog                                   |  4 ++-
 .../debian/debian/copyright                        | 31 +++++++++++++++++++---
 t/tests/source-copyright-undefined/tags            | 21 ++++++++++++---
 4 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/data/source-copyright/bad-short-licenses b/data/source-copyright/bad-short-licenses
index 306fee4..27d2d15 100644
--- a/data/source-copyright/bad-short-licenses
+++ b/data/source-copyright/bad-short-licenses
@@ -8,9 +8,10 @@
 # some misspellings of BSD licenses
 ^bsd$                                     ~~ invalid-short-name-in-dep5-copyright
 ^bsd[^-]?[234][^-]?(?:clause|cluase)$     ~~ invalid-short-name-in-dep5-copyright
-(^|\s)-(\s|$)                                     ~~ license-problem-undefined-license
-\bfixme\b                                 ~~ license-problem-undefined-license
+# undefined license
+\A-\Z                                     ~~ license-problem-undefined-license
+\bfixmes?\b                               ~~ license-problem-undefined-license
 \btodos?\b                                ~~ license-problem-undefined-license
-\bundefined\b                             ~~ license-problem-undefined-license
+\bundefined?\b                            ~~ license-problem-undefined-license
 \bunknown?\b                              ~~ license-problem-undefined-license
 \bunspecified\b                           ~~ license-problem-undefined-license
diff --git a/debian/changelog b/debian/changelog
index 11685c8..a601477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 lintian (2.5.31) UNRELEASED; urgency=medium
 
-  * checks/changelog-file.pm:
+  * checks/changelog-file.{desc,pm}:
     + [BR] Correct a typo on tag name and do not raise
       bad-intended-distribution if distribution is still
       set to UNRELEASED.  (Closes: #765344).
@@ -18,6 +18,8 @@ lintian (2.5.31) UNRELEASED; urgency=medium
       emit a specific tag.
       (Closes: #766118).
     + [BR] Detect if license short name are unique.
+    + [BR] Avoid false positive license-problem-undefined-license
+      for - in short license.
 
   * collection/strings:
     + [NT] Pass "-a" to strings to avoid possible security
diff --git a/t/tests/source-copyright-undefined/debian/debian/copyright b/t/tests/source-copyright-undefined/debian/debian/copyright
index 86cdd30..24c9758 100644
--- a/t/tests/source-copyright-undefined/debian/debian/copyright
+++ b/t/tests/source-copyright-undefined/debian/debian/copyright
@@ -14,18 +14,43 @@ Copyright: 2014, somebody2
 License: unknown
  Fixme
 
-Files: debian/a*
+Files: debian/a
 Copyright: 2014, somebody2
 License: unknow
  Fixme
 
-Files: debian/b*
+Files: debian/b
 Copyright: 2014, somebody2
 License: todo
  Fixme
 
-Files: debian/c*
+Files: debian/c
+comment: some spacing
+Copyright: 2014, somebody2
+License:            -
+ Fixme
+
+Files: debian/d
+comment: some spacing
+Copyright: 2014, somebody2
+License: -       
+ Fixme
+
+Files: debian/e
+Comment: too many false positive with space
+Copyright: 2014, somebody2
+License: undefined undefined
+ Fixme
+
+Files: debian/f
+comment: some spacing
 Copyright: 2014, somebody2
 License: undefined
  Fixme
 
+Files: debian/g
+comment: false positive
+Copyright: 2014, somebody2
+License: common public license - v 1.0
+ Fixme
+
diff --git a/t/tests/source-copyright-undefined/tags b/t/tests/source-copyright-undefined/tags
index af89e2e..e5614bd 100644
--- a/t/tests/source-copyright-undefined/tags
+++ b/t/tests/source-copyright-undefined/tags
@@ -1,10 +1,25 @@
+E: source-copyright-undefined source: license-problem-undefined-license - (paragraph at line 33)
 E: source-copyright-undefined source: license-problem-undefined-license fixme (paragraph at line 6)
 E: source-copyright-undefined source: license-problem-undefined-license todo (paragraph at line 22)
-E: source-copyright-undefined source: license-problem-undefined-license undefined (paragraph at line 27)
+E: source-copyright-undefined source: license-problem-undefined-license undefined (paragraph at line 45)
+E: source-copyright-undefined source: license-problem-undefined-license undefined undefined (paragraph at line 39)
 E: source-copyright-undefined source: license-problem-undefined-license unknow (paragraph at line 17)
 E: source-copyright-undefined source: license-problem-undefined-license unknown (paragraph at line 12)
 I: source-copyright-undefined source: unused-file-paragraph-in-dep5-copyright paragraph at line 17
 I: source-copyright-undefined source: unused-file-paragraph-in-dep5-copyright paragraph at line 22
+I: source-copyright-undefined source: unused-file-paragraph-in-dep5-copyright paragraph at line 27
+I: source-copyright-undefined source: unused-file-paragraph-in-dep5-copyright paragraph at line 33
+I: source-copyright-undefined source: unused-file-paragraph-in-dep5-copyright paragraph at line 39
+I: source-copyright-undefined source: unused-file-paragraph-in-dep5-copyright paragraph at line 45
+I: source-copyright-undefined source: unused-file-paragraph-in-dep5-copyright paragraph at line 51
 I: source-copyright-undefined source: unused-file-paragraph-in-dep5-copyright paragraph at line 6
-I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/a* (paragraph at line 17)
-I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/b* (paragraph at line 22)
+I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/a (paragraph at line 17)
+I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/b (paragraph at line 22)
+I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/c (paragraph at line 27)
+I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/d (paragraph at line 33)
+I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/e (paragraph at line 39)
+I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/f (paragraph at line 45)
+I: source-copyright-undefined source: wildcard-matches-nothing-in-dep5-copyright debian/g (paragraph at line 51)
+W: source-copyright-undefined source: dep5-copyright-license-name-not-unique (paragraph at line 33)
+W: source-copyright-undefined source: space-in-std-shortname-in-dep5-copyright common public license - v 1.0 (paragraph at line 51)
+W: source-copyright-undefined source: space-in-std-shortname-in-dep5-copyright undefined undefined (paragraph at line 39)

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


Reply to: