[SCM] Debian package checker branch, master, updated. 2.5.10-124-ged518ac

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit ed518ac68fccbe25aa9d716a68a7b5f9f994bc20
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Sep 3 10:54:46 2012 +0200

    L::Tags: Explain why an override was rejected
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 1addd29..020d982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,6 +147,10 @@ lintian (2.5.11) UNRELEASED; urgency=low
     + [NT] Fix poor error message due to the wrong variable
       being unused.  Thanks to Christoph Biedl for the report
       (Closes: #682941)
+  * lib/Lintian/Tags.pm:
+    + [NT] Be explicit about the reason when rejecting an
+      override.  Thanks to Yves-Alexis Perez for the report.
+      (Closes: #673073)
   * lib/Lintian/Unpacker.pm:
     + [NT] New file.
 
diff --git a/lib/Lintian/Tags.pm b/lib/Lintian/Tags.pm
index 4dd64d9..005a689 100644
--- a/lib/Lintian/Tags.pm
+++ b/lib/Lintian/Tags.pm
@@ -25,7 +25,7 @@ use warnings;
 use Lintian::Architecture qw(:all);
 use Lintian::Output;
 use Lintian::Tag::Override;
-use Lintian::Util qw(fail);
+use Lintian::Util qw(fail $PKGNAME_REGEX);
 
 use base 'Exporter';
 BEGIN {
@@ -523,20 +523,30 @@ sub file_overrides {
         my $override = $_;
         # The override looks like the following:
         # [[pkg-name] [arch-list] [pkg-type]:] <tag> [extra]
-        if ($override =~ m/^(?:                    # start optional part
-                  (?:\Q$info->{package}\E)?        # Optionally starts with package name
-                  (?: \s*+ \[([^\]]+?)\])?         # optionally followed by an [arch-list] (like in B-D) -> $1
-                  (?: \s*+ \Q$info->{type}\E)?     # optionally followed by the type
-                :\s++)?                            # end optional part
-                ([\-\.a-zA-Z_0-9]+ (?:\s.+)?)$/x){ # <tag-name> [extra] -> $2
+        if ($override =~ m/^(?:                     # start optional part
+                  ($PKGNAME_REGEX)?                 # optionally starts with package name -> $1
+                  (?: \s*+ \[([^\]]+?)\])?          # optionally followed by an [arch-list] (like in B-D) -> $2
+                  (?:\s*+ ([a-z]+) \s*+ )?          # optionally followed by the type -> $3
+                :\s++)?                             # end optional part
+                ([\-\.a-zA-Z_0-9]+ (?:\s.+)?)$/ox){ # <tag-name> [extra] -> $4
             # Valid - so far at least
-            my ($archlist, $tagdata) = ($1, $2);
+            my ($opkg_name, $archlist, $opkg_type, $tagdata) = ($1, $2, $3, $4);
             my ($tag, $extra) = split(m/ /o, $tagdata, 2);
             my $tagover;
             my $com;
             my $data;
+            if ($opkg_name and $opkg_name ne $info->{package}) {
+                tag 'malformed-override',
+                    "Override of $tag for $opkg_name (expecting $info->{package}) at line $.";
+                next;
+            }
+            if ($opkg_type and $opkg_type ne $info->{type}) {
+                tag 'malformed-override',
+                    "Override of $tag for package type $opkg_type (expecting $info->{type}) at line $.";
+                next;
+            }
             if ($info->{arch} eq 'all' && $archlist) {
-                tag 'malformed-override', $_, 'Architecture list for arch:all package';
+                tag 'malformed-override', "Architecture list for arch:all package at line $. (for tag $tag)";
                 next;
             }
             if ($archlist) {
@@ -551,13 +561,13 @@ sub file_overrides {
                     } elsif (is_arch ($a)) {
                         $found = 1 if $a eq $info->{arch};
                     } else {
-                        tag 'malformed-override', $_, "Unknown architecture \"$a\"";
+                        tag 'malformed-override', "Unknown architecture \"$a\" at line $. (for tag $tag)";
                         next OVERRIDE;
                     }
                 }
                 if ($negated > 0 && scalar @archs != $negated){
                     # missing a ! somewhere
-                    tag 'malformed-override', $_, 'Inconsistent architecture negation';
+                    tag 'malformed-override', "Inconsistent architecture negation at line $. (for tag $tag)";
                     next;
                 }
                 # missing wildcard checks and sanity checking archs $arch
@@ -591,7 +601,7 @@ sub file_overrides {
             $info->{overrides}{$tag}{$extra} = 0;
             $last_over = $tagover;
         } else {
-            tag('malformed-override', $_);
+            tag 'malformed-override', "Cannot parse line $.: $_";
         }
     }
     close $file;
diff --git a/t/tests/lintian-overrides/tags b/t/tests/lintian-overrides/tags
index e0d314d..5b56d9a 100644
--- a/t/tests/lintian-overrides/tags
+++ b/t/tests/lintian-overrides/tags
@@ -1,2 +1,2 @@
-E: lintian-overrides: malformed-override lintian-override:
+E: lintian-overrides: malformed-override Cannot parse line 1: lintian-override:
 I: lintian-overrides: unused-override copyright-contains-dh_make-todo-boilerplate foo-bar-extra

-- 
Debian package checker