[lintian] 02/03: Clarify empty short license case
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit 42936f0e40cb6c13c2d7efb68f90a48f357bc026
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Thu Jul 17 22:34:32 2014 +0200
Clarify empty short license case
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/source-copyright.pm | 12 ++++++++----
t/tests/source-copyright-empty-field/tags | 4 ++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index 90ff7f9..4750d31 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -260,7 +260,8 @@ sub _parse_dep5 {
"(paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
} elsif ($license =~ m/\A\s*\n/xms) {
tag 'missing-field-in-dep5-copyright', 'license',
-"( empty field, paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
+ '(empty short license,',
+ "paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
}
($license, undef) = split /\n/, $license, 2;
for (split_licenses($license)) {
@@ -269,7 +270,8 @@ sub _parse_dep5 {
} elsif (defined $files) {
if ($files =~ m/\A\s*\Z/mxs) {
tag 'missing-field-in-dep5-copyright', 'files',
-"(empty field, paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
+ '(empty field,',
+ "paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
}
# Files paragraph
if (not @commas_in_files and $files =~ /,/) {
@@ -278,7 +280,8 @@ sub _parse_dep5 {
if (defined $license) {
if ($license =~ m/\A\s*\n/xms) {
tag 'missing-field-in-dep5-copyright', 'license',
-"(empty field, paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
+ '(empty short license,',
+ "paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
} else {
for (split_licenses($license)) {
$required_standalone_licenses{$_} = $i;
@@ -293,7 +296,8 @@ sub _parse_dep5 {
"(paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
} elsif ($copyright =~ m/\A\s*\Z/mxs) {
tag 'missing-field-in-dep5-copyright', 'copyright',
-"(empty field, paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
+ '(empty field,',
+ "paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
}
}else {
diff --git a/t/tests/source-copyright-empty-field/tags b/t/tests/source-copyright-empty-field/tags
index 354123a..2bd9841 100644
--- a/t/tests/source-copyright-empty-field/tags
+++ b/t/tests/source-copyright-empty-field/tags
@@ -1,5 +1,5 @@
W: source-copyright-empty-field source: missing-field-in-dep5-copyright copyright (empty field, paragraph at line 6)
W: source-copyright-empty-field source: missing-field-in-dep5-copyright files (empty field, paragraph at line 42)
-W: source-copyright-empty-field source: missing-field-in-dep5-copyright license ( empty field, paragraph at line 60)
-W: source-copyright-empty-field source: missing-field-in-dep5-copyright license (empty field, paragraph at line 24)
+W: source-copyright-empty-field source: missing-field-in-dep5-copyright license (empty short license, paragraph at line 24)
+W: source-copyright-empty-field source: missing-field-in-dep5-copyright license (empty short license, paragraph at line 60)
W: source-copyright-empty-field source: missing-license-text-in-dep5-copyright (paragraph at line 76)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: