[SCM] Debian package checker branch, master, updated. 2.5.6-30-g6bca8f4

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

The following commit has been merged in the master branch:
commit 6bca8f4830f95e27657c70d45b7ec6003dbe3673
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Mar 26 11:15:27 2012 +0200

    L::Tag::Info: Use L::Data to load manual-references
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 550957a..edb3a6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,9 @@ lintian (2.5.7) UNRELEASED; urgency=low
     + [NT] Normalize profile name and replace "parents" with
       "profile_list".  The latter also includes the current profile
       name.
+  * lib/Lintian/Tag/Info.pm:
+    + [NT] Use Lintian::Data to load the manual-references data
+      file instead using an ad-hoc parser.
   * lib/Util.pm:
     + [JW] Consider duplicate fields a syntax error in dctrl files.
       Previously, duplicate fields were silently ignored (except
diff --git a/lib/Lintian/Tag/Info.pm b/lib/Lintian/Tag/Info.pm
index 8b1f91c..cc51d49 100644
--- a/lib/Lintian/Tag/Info.pm
+++ b/lib/Lintian/Tag/Info.pm
@@ -36,7 +36,7 @@ our $MANURL
 
 # Stores the parsed manual reference data.  Loaded the first time info()
 # is called.
-our %MANUALS;
+our $MANUALS = Lintian::Data->new ('output/manual-references', qr/::/, \&_load_manual_data);
 
 # Map severity/certainty levels to tag codes.
 our %CODES = (
@@ -152,26 +152,17 @@ formatted output.
 
 =cut
 
-# Load manual reference data into %MANUALS.  This information doesn't have
-# a single unique key and has multiple data values per key, so we don't
-# try to use the Lintian::Data interface.  Instead, we read a file
-# delimited by double colons.  We do use a path similar to Lintian::Data
-# to keep such files in the same general location.
+# Parse manual reference data from the data file.
 sub _load_manual_data {
-    my $root = $ENV{LINTIAN_ROOT} || '/usr/share/lintian';
-    open(REFS, '<', "$root/data/output/manual-references")
-        or fail("can't open $root/data/output/manual-references: $!");
-    local $_;
-    while (<REFS>) {
-        chomp;
-        next if /^\#/;
-        next if /^\s*$/;
-        next unless /^(.+?)::(.*?)::(.+?)::(.*?)$/;
-        my ($manual, $section, $title, $url) = split('::');
-        $MANUALS{$manual}{$section}{title} = $title;
-        $MANUALS{$manual}{$section}{url} = $url;
+    my ($key, $rawvalue, $pval) = @_;
+    my ($section, $title, $url) = split m/::/, $rawvalue, 3;
+    my $ret = undef;
+    if (not defined $pval) {
+        $ret = $pval = {};
     }
-    close REFS;
+    $pval->{$section}{title} = $title;
+    $pval->{$section}{url} = $url;
+    return $ret;
 }
 
 # Format a reference to a manual in the HTML that Lintian uses internally
@@ -180,12 +171,12 @@ sub _load_manual_data {
 # argument isn't a known manual.
 sub _manual_reference {
     my ($manual, $section) = @_;
-    _load_manual_data unless %MANUALS;
-    return '' unless exists $MANUALS{$manual}{''};
+    return '' unless $MANUALS->known ($manual);
 
+    my $man = $MANUALS->value ($manual);
     # Start with the reference to the overall manual.
-    my $title = $MANUALS{$manual}{''}{title};
-    my $url   = $MANUALS{$manual}{''}{url};
+    my $title = $man->{''}{title};
+    my $url   = $man->{''}{url};
     my $text  = $url ? qq(<a href="$url">$title</a>) : $title;
 
     # Add the section information, if present, and a direct link to that
@@ -197,9 +188,9 @@ sub _manual_reference {
     } elsif ($section and $section =~ /^[A-Z\d.]+$/) {
         $text .= " section $section";
     }
-    if ($section and exists $MANUALS{$manual}{$section}) {
-        my $sec_title = $MANUALS{$manual}{$section}{title};
-        my $sec_url   = $MANUALS{$manual}{$section}{url};
+    if ($section and exists $man->{$section}) {
+        my $sec_title = $man->{$section}{title};
+        my $sec_url   = $man->{$section}{url};
         $text .= $sec_url ? qq[ (<a href="$sec_url">$sec_title</a>)] : qq[ ($sec_title)];
     }
 

-- 
Debian package checker