[SCM] Debian package checker branch, master, updated. 1.24.2-28-g6bed16c

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

The following commit has been merged in the master branch:
commit 6bed16c2337f2ea3bcff8753fed3d8b126b7168b
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Fri Jul 25 01:45:51 2008 +0100

    [ADB] Replace fields/* access with Lintian::Collect::field()

diff --git a/checks/debconf b/checks/debconf
index 1b197ba..95d050f 100644
--- a/checks/debconf
+++ b/checks/debconf
@@ -29,6 +29,7 @@ sub run {
 
 my $pkg = shift;
 my $type = shift;
+my $info = shift;
 
 # From debconf-devel(7), section 'THE TEMPLATES FILE', up to date with debconf
 # version 1.3.22.  Added indices for cdebconf (indicates sort order for
@@ -69,9 +70,7 @@ my $usespreinst='';
 my $usesmultiselect='';
 
 if ($type eq 'source') {
-    open(BINARY, '<', "fields/binary") or fail("Can't open fields/binary: $!");
-    my $binaries = <BINARY>;
-    close BINARY;
+    my $binaries = $info->field('binary');
     chomp $binaries;
     my @files = map { "$_.templates" } split /,\s+/, $binaries;
     push @files, "templates";
@@ -130,9 +129,8 @@ return unless $seenconfig or $seentemplates or $usespreinst;
 
 # Consider every package to depend on itself.
 my $version;
-if (-f "fields/version") {
-    open(IN, '<', "fields/version") or fail("Can't open fields/version: $!");
-    chomp($_ = <IN>);
+if (defined $info->field('version')) {
+    $_ = $info->field('version');
     $version = "$pkg (= $_)";
     close IN;
 }
@@ -140,10 +138,8 @@ if (-f "fields/version") {
 my (%dependencies, @alldeps);
 
 for my $field (qw(depends pre-depends)) {
-    if (-f "fields/$field") {
-	open(IN, '<', "fields/$field") or fail("Can't open fields/$field: $!");
-	chomp($_ = <IN>);
-	close IN;
+    if (defined $info->field($field)) {
+	$_ = $info->field($field);
 	$_ .= ", $version" if defined $version;
         push @alldeps, $_;
 	$dependencies{$field} = Dep::parse($_);
diff --git a/debian/changelog b/debian/changelog
index dd43938..d7c97d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ lintian (1.24.3) unstable; urgency=low
     + [ADB] Don't complain about unused debconf templates in udebs.
       (Closes: #491135)
     + [RA] Try to recognize at least some debconf template uses in Perl.
+    + [ADB] Replace fields/* access with Lintian::Collect::field()
   * checks/description:
     + [RA] Don't warn about a synopsis that ends in "etc."  Patch from
       Chris Lamb.  (Closes: #491252)

-- 
Debian package checker