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

[lintian] 01/01: c/src-cpy: Fix a "ref header" warning for the header paragraph itself



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

nthykier pushed a commit to branch master
in repository lintian.

commit 35c01509bd02771be38b5d1b870d0ef45d8d1a79
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 1 20:59:36 2015 +0200

    c/src-cpy: Fix a "ref header" warning for the header paragraph itself
    
    Avoid emitting dep5-file-paragraph-reference-header-paragraph for the
    header paragraph, when it has a full license text itself.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/source-copyright.pm | 3 ++-
 debian/changelog           | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index 7c1dd5d..b81eb55 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -250,7 +250,8 @@ sub _parse_dep5 {
         @short_licenses_header)
       =parse_license($first_para->{'license'}, 1);
     for my $short_license (@short_licenses_header) {
-        $required_standalone_licenses{$short_license} = 0;
+        $required_standalone_licenses{$short_license} = 0
+          if not defined($full_license_header);
         $short_licenses_seen{$short_license}          = 1;
     }
     if(defined($full_license_header)) {
diff --git a/debian/changelog b/debian/changelog
index 5d77e07..dd20f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ lintian (2.5.33) UNRELEASED; urgency=medium
       (Closes: #790323)
   * checks/source-copyright.pm:
     + [NT] Fix use of undefined variable in some cases.
+    + [NT] Avoid triggering a tag for a DEP-5 paragraph
+      referencing the license of the header paragraph
+      when said paragraph is *the* header paragraph.
 
   * data/spelling/corrections-multiword:
     + [JW] Correct spelling for "GNU Public Licence".

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


Reply to: