[SCM] Debian package checker branch, master, updated. 2.5.14-86-g580e7f1

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

The following commit has been merged in the master branch:
commit 580e7f190a3fb1b8aad81b9a7857f1eac5335993
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jul 22 16:06:22 2013 +0200

    L::Data: Replace use of $_ with a named variable
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/lib/Lintian/Data.pm b/lib/Lintian/Data.pm
index 38972f4..c53b049 100644
--- a/lib/Lintian/Data.pm
+++ b/lib/Lintian/Data.pm
@@ -136,12 +136,12 @@ sub _parse_file {
     my ($self, $type, $fd, $dataset, $separator, $code, $vendors, $vno) = @_;
     my $filename = $type;
     $filename = $vendors->[$vno] . '/' . $type if $vno < scalar @$vendors;
-    local ($_, $.);
-    while (<$fd>) {
-        strip;
-        next if /^\#/ or $_ eq '';
-        if (s/^\@//) {
-            my ($op, $value) = split m/\s++/;
+    local $.;
+    while (my $line = <$fd>) {
+        strip($line);
+        next if $line =~ m{ \A \#}xsm or $line eq '';
+        if ($line =~ s/^\@//) {
+            my ($op, $value) = split(m{ \s++ }xsm, $line, 2);
             if ($op eq 'delete') {
                 croak "Missing key after \@delete in $filename at line $."
                     unless defined $value && length $value;
@@ -160,7 +160,7 @@ sub _parse_file {
 
         my ($key, $val);
         if (defined $separator) {
-            ($key, $val) = split(/$separator/, $_, 2);
+            ($key, $val) = split(/$separator/, $line, 2);
             if ($code) {
                 my $pval = $dataset->{$key};
                 $val = $code->($key, $val, $pval) if $code;
@@ -171,7 +171,7 @@ sub _parse_file {
                 }
             }
         } else {
-            ($key, $val) = ($_ => 1);
+            ($key, $val) = ($line => 1);
         }
         $dataset->{$key} = $val;
     }

-- 
Debian package checker