[lintian] 01/06: Check empty short license for first paragraph
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit df03997f7e812376460eebee3ceaf8ec4b27d6ec
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Thu Jul 17 23:26:12 2014 +0200
Check empty short license for first paragraph
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/source-copyright.pm | 24 +++++++++++++++-------
t/tests/source-copyright-dep5-general/tags | 2 +-
.../debian/debian/copyright | 1 +
t/tests/source-copyright-empty-field/tags | 16 +++++++--------
4 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index 4750d31..b7117f1 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -230,8 +230,17 @@ sub _parse_dep5 {
tag 'missing-field-in-dep5-copyright', 'format',
"(line $lines[0]{'format'})";
}
- for my $license (split_licenses($first_para->{'license'})) {
- $required_standalone_licenses{$license} = 1;
+
+ if (defined($first_para->{'license'})) {
+ my $license = $first_para->{'license'};
+ if ($license =~ m/\A\s*(\n|\Z)/xms) {
+ tag 'missing-field-in-dep5-copyright', 'license',
+ '(empty short license header paragraph)';
+ } else {
+ for my $license (split_licenses($first_para->{'license'})) {
+ $required_standalone_licenses{$license} = 1;
+ }
+ }
}
my @commas_in_files;
my $i = 0;
@@ -262,10 +271,11 @@ sub _parse_dep5 {
tag 'missing-field-in-dep5-copyright', 'license',
'(empty short license,',
"paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
- }
- ($license, undef) = split /\n/, $license, 2;
- for (split_licenses($license)) {
- $standalone_licenses{$_} = $i;
+ } else {
+ ($license, undef) = split /\n/, $license, 2;
+ for (split_licenses($license)) {
+ $standalone_licenses{$_} = $i;
+ }
}
} elsif (defined $files) {
if ($files =~ m/\A\s*\Z/mxs) {
@@ -278,7 +288,7 @@ sub _parse_dep5 {
@commas_in_files = ($i, $files_fname);
}
if (defined $license) {
- if ($license =~ m/\A\s*\n/xms) {
+ if ($license =~ m/\A\s*(\n|\Z)/xms) {
tag 'missing-field-in-dep5-copyright', 'license',
'(empty short license,',
"paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
diff --git a/t/tests/source-copyright-dep5-general/tags b/t/tests/source-copyright-dep5-general/tags
index 25c4b4a..b1a2685 100644
--- a/t/tests/source-copyright-dep5-general/tags
+++ b/t/tests/source-copyright-dep5-general/tags
@@ -1,9 +1,9 @@
-I: source-copyright-dep5-general source: unused-license-paragraph-in-dep5-copyright bsd-3 (paragraph at line 22)
I: source-copyright-dep5-general source: unused-license-paragraph-in-dep5-copyright expat (paragraph at line 44)
W: source-copyright-dep5-general source: ambiguous-paragraph-in-dep5-copyright paragraph at line 22
W: source-copyright-dep5-general source: comma-separated-files-in-dep5-copyright paragraph at line 8
W: source-copyright-dep5-general source: missing-field-in-dep5-copyright copyright (paragraph at line 15)
W: source-copyright-dep5-general source: missing-field-in-dep5-copyright license (paragraph at line 12)
+W: source-copyright-dep5-general source: missing-license-paragraph-in-dep5-copyright gpl-3 (paragraph at line 15)
W: source-copyright-dep5-general source: missing-license-paragraph-in-dep5-copyright mit (paragraph at line 18)
W: source-copyright-dep5-general source: missing-license-text-in-dep5-copyright bsd-3 (paragraph at line 22)
W: source-copyright-dep5-general source: missing-license-text-in-dep5-copyright gpl-3 (paragraph at line 42)
diff --git a/t/tests/source-copyright-empty-field/debian/debian/copyright b/t/tests/source-copyright-empty-field/debian/debian/copyright
index 67fdff0..dd0541b 100644
--- a/t/tests/source-copyright-empty-field/debian/debian/copyright
+++ b/t/tests/source-copyright-empty-field/debian/debian/copyright
@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Doohickey
Upstream-Contact: J. Random Hacker <j.r.hacker@example.com>
Source: http://examples.com/doohickey/source/
+License:
Files: *
Copyright:
diff --git a/t/tests/source-copyright-empty-field/tags b/t/tests/source-copyright-empty-field/tags
index 8081848..d0d3486 100644
--- a/t/tests/source-copyright-empty-field/tags
+++ b/t/tests/source-copyright-empty-field/tags
@@ -1,8 +1,8 @@
-I: source-copyright-empty-field source: unused-license-paragraph-in-dep5-copyright gpl-2+ (paragraph at line 96)
-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 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-field-in-dep5-copyright license (empty short license, paragraph at line 76)
-W: source-copyright-empty-field source: missing-license-text-in-dep5-copyright (paragraph at line 94)
-W: source-copyright-empty-field source: missing-license-text-in-dep5-copyright gpl-2+ (paragraph at line 96)
+W: source-copyright-empty-field source: missing-field-in-dep5-copyright copyright (empty field, paragraph at line 7)
+W: source-copyright-empty-field source: missing-field-in-dep5-copyright files (empty field, paragraph at line 43)
+W: source-copyright-empty-field source: missing-field-in-dep5-copyright license (empty short license header paragraph)
+W: source-copyright-empty-field source: missing-field-in-dep5-copyright license (empty short license, paragraph at line 25)
+W: source-copyright-empty-field source: missing-field-in-dep5-copyright license (empty short license, paragraph at line 61)
+W: source-copyright-empty-field source: missing-field-in-dep5-copyright license (empty short license, paragraph at line 77)
+W: source-copyright-empty-field source: missing-license-text-in-dep5-copyright (paragraph at line 95)
+W: source-copyright-empty-field source: missing-license-text-in-dep5-copyright gpl-2+ (paragraph at line 97)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: