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

[SCM] Debian package checker branch, master, updated. 1.24.2-25-g89a3dc6



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

    Use Lintian::Collect->field() instead of direct file access
    
    * checks/cruft:
      + [ADB] Use Lintian::Collect for accessing control fields

diff --git a/checks/cruft b/checks/cruft
index ae58ad3..762da7c 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -76,9 +76,6 @@ my @file_checks =
 # again in the source checks.
 my %warned;
 
-# Whether this is a native Debian package.
-my $native;
-
 my $dir;
 my $atdinbd;
 
@@ -108,9 +105,9 @@ if ($info->native) {
 # Check if this is a documentation package that's not arch: all.  This doesn't
 # really belong here either.
 my $arch;
-if (open IN, '<', "fields/architecture") {
-    chop($arch = <IN>);
-    close IN;
+if (defined $info->field('architecture')) {
+    my $arch;
+    chop($arch = $info->field('architecture'));
     if ($pkg =~ /-docs?$/ && $arch ne 'all') {
         tag 'documentation-package-not-architecture-independent';
     }
@@ -121,10 +118,9 @@ if (open IN, '<', "fields/architecture") {
 # depend on autoconf and automake and then use autoreconf to update
 # config.guess and config.sub, and automake depends on autotools-dev.
 $atdinbd = 0;
-if (open IN, '<', "fields/build-depends") {
+if (defined $info->field('build-depends')) {
     my $bd;
-    chop($bd = <IN>);
-    close IN;
+    chop($bd = $info->field('build-depends'));
     $atdinbd = 1 if Dep::implies(Dep::parse($bd), Dep::parse($autotools_pkgs));
 }
 
diff --git a/debian/changelog b/debian/changelog
index 51aa583..6179018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ lintian (1.24.3) unstable; urgency=low
     + [ADB] Drop the "copyright line too long" check.  Most of the issues
       it flags aren't easily fixable, particularly where the copyright file
       is (semi)automatically generated.  (Closes: #491302, #491365, #491685)
+  * checks/cruft:
+    + [ADB] Use Lintian::Collect for accessing control fields
   * checks/debconf:
     + [ADB] Don't complain about unused debconf templates in udebs.
       (Closes: #491135)

-- 
Debian package checker


Reply to: