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

[SCM] Debian package checker branch, master, updated. 2.1.5-9-g1e76ebe



The following commit has been merged in the master branch:
commit 1e76ebe385840b9bd169d31fc3c7fe89139d296a
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Sun Jan 11 23:39:51 2009 +0000

    Warn about duplicated uploaders
    
    * checks/fields{,.desc}:
      + Warn about an individual uploader appearing multiple times
        in Uploaders.  Thanks, Joerg Jaspert.  (Closes: #511536)

diff --git a/checks/fields b/checks/fields
index 9f15aa4..003cb88 100644
--- a/checks/fields
+++ b/checks/fields
@@ -254,7 +254,15 @@ for my $f (qw(maintainer uploaders)) {
 		$maintainer =~ s/^\s*(.+?)\s*$/$1/; #Remove leading and trailing whitespace
 
 		if ($f eq "uploaders") {
-			check_maintainer($_, "uploader") for (split /\s*,\s*/, $maintainer);
+			my @uploaders = split /\s*,\s*/, $maintainer;
+			my %duplicate_uploaders;
+			for my $uploader (@uploaders) {
+			 	check_maintainer($uploader, "uploader");
+				if ( ((grep { $_ eq $uploader } @uploaders) > 1) and
+				     ($duplicate_uploaders{$uploader}++ == 0)) {
+					tag 'duplicate-uploader', $uploader;
+				}
+			}
 		} else {
 			check_maintainer($maintainer, $f);
 			if ($type eq 'source'
diff --git a/checks/fields.desc b/checks/fields.desc
index 21c35e3..93874d6 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -897,6 +897,12 @@ Info: The maintainer value also appears on the <tt>Uploaders</tt> field.
  longer any need to list the maintainer in Uploaders.  The duplicate
  information should probably be removed.
 
+Tag: duplicate-uploader
+Severity: minor
+Certainty: certain
+Info: The uploader appears more than once in the <tt>Uploaders</tt>
+ field.  The duplicate information should be removed.
+
 Tag: versioned-dependency-satisfied-by-perl
 Severity: normal
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index e8ee9ac..a1b38d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ lintian (2.1.6) UNRELEASED; urgency=low
       Thanks, Joerg Jaspert.  (Closes: #510957)
     + [RA] Warn about .hgtags files in the diff and source.  Thanks,
       Holger Levsen and Chris Lamb.  (Closes: #464837)
+  * checks/fields{,.desc}:
+    + [ADB] Warn about an individual uploader appearing multiple times
+      in Uploaders.  Thanks, Joerg Jaspert.  (Closes: #511536)
   * checks/lintian.desc:
     + [RA] Add tag description for malformed-changes-file.
   * checks/nmu{,.desc}:
diff --git a/testset/description/debian/control b/testset/description/debian/control
index 914f59a..15b4abd 100644
--- a/testset/description/debian/control
+++ b/testset/description/debian/control
@@ -2,7 +2,8 @@ Source: description
 Section: text
 Priority: extra
 Maintainer: Tobias Toedter <toddy@debian.org>
-Uploaders: Tobias Toedter <toddy@debian.org>, Foo Bar Moo <foo@debian.org>
+Uploaders: Tobias Toedter <toddy@debian.org>, Foo Bar Moo <foo@debian.org>,
+ Tobias Toedter <toddy@debian.org>
 Standards-Version: 3.8.0
 
 Package: description
diff --git a/testset/tags.description b/testset/tags.description
index f712cd1..7ac7cfe 100644
--- a/testset/tags.description
+++ b/testset/tags.description
@@ -19,6 +19,7 @@ I: description-foo: no-md5sums-control-file
 I: description-qux: extended-description-is-probably-too-short
 I: description-qux: no-md5sums-control-file
 I: description: no-md5sums-control-file
+W: description source: duplicate-uploader Tobias Toedter <toddy@debian.org>
 W: description source: maintainer-also-in-uploaders
 W: description source: native-package-with-dash-version
 W: description-bar: extended-description-line-too-long

-- 
Debian package checker


Reply to: