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

[SCM] Debian package checker branch, master, updated. 1.24.2-22-g8f76dfb



The following commit has been merged in the master branch:
commit 8f76dfbb7e41c516881196d2a4bcae488e78d9a3
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Thu Jul 24 22:13:37 2008 +0100

    Use Lintian::Collect
    
      * checks/nmu:
        + [ADB] Use Lintian::Collect for maintainer / uploader information

diff --git a/checks/nmu b/checks/nmu
index 0f4b032..8581966 100644
--- a/checks/nmu
+++ b/checks/nmu
@@ -27,6 +27,7 @@ sub run {
 
 my $pkg = shift;
 my $type = shift;
+my $info = shift;
 my $changelog_mentions_nmu = 0;
 my $changelog_mentions_qa = 0;
 my $uploader = undef;
@@ -58,9 +59,9 @@ while (<CHANGELOG>) {
 }
 close CHANGELOG;
 
-my $version = getfield("version");
-my $maintainer = canonicalize(getfield("maintainer"));
-my $uploaders = getfield("uploaders");
+my $version = $info->field("version");
+my $maintainer = canonicalize($info->field("maintainer"));
+my $uploaders = $info->field("uploaders");
 
 my $version_nmuness = 0;
 if ($version =~ /-[^.-]+(\.[^.-]+)?(\.[^.-]+)?$/) {
@@ -106,14 +107,6 @@ if ($maintainer =~ /packages\@qa.debian.org/) {
 
 }
 
-sub getfield {
-	return undef if not open (FIELD, '<', "fields/" . shift);
-	my $field = <FIELD>;
-	close FIELD;
-	$field =~ s/\n$//;
-	return $field;
-}
-
 # Canonicalize a maintainer address with respect to case.  E-mail addresses
 # are case-insensitive in the right-hand side.
 sub canonicalize {
diff --git a/debian/changelog b/debian/changelog
index 26339ea..0c2bd65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ lintian (1.24.3) unstable; urgency=low
     + [RA] Suppress warnings about inability to break a line that contains
       a URL.  URLs often can't be usefully broken.  Based on a patch by
       Damyan Ivanov.  (Closes: #491578)
+  * checks/nmu:
+    + [ADB] Use Lintian::Collect for maintainer / uploader information
   * checks/patch-systems:
     + [RA] Combine all patch-system-but-direct-changes-in-diff instances
       into a single message to reduce the noise from packages that rebuild

-- 
Debian package checker


Reply to: