X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FSrcPage.pm;h=101d6f2635523e8bb85f29a486c6b4d2b80273d7;hb=700bda5f70856bd601da863e9febef947cbc3c11;hp=7fc0e270584867877efc2fb8de68d8fd3d1dc34a;hpb=b21dd56695db580574c998f2f9ca59e18d168c06;p=deb%2Fpackages.git

diff --git a/lib/Packages/SrcPage.pm b/lib/Packages/SrcPage.pm
index 7fc0e27..101d6f2 100644
--- a/lib/Packages/SrcPage.pm
+++ b/lib/Packages/SrcPage.pm
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use Data::Dumper;
-use Locale::gettext;
 use Deb::Versions;
 use Packages::CGI;
 use Packages::Page qw( :all );
@@ -39,20 +38,9 @@ sub merge_package {
 
 	$self->{data} = $data;
 
-	my @uploaders;
-	if ($data->{maintainer} ||= '') {
-	    push @uploaders, [ split_name_mail( $data->{maintainer} ) ];
-	}
-	if ($data->{uploaders}) {
-	    my @up_tmp = split( /\s*,\s*/,
-				$data->{uploaders} );
-	    foreach my $up (@up_tmp) {
-		if ($up ne $data->{maintainer}) { # weed out duplicates
-		    push @uploaders, [ split_name_mail( $up ) ];
-		}
-	    }
-	}
-	$self->{uploaders} = \@uploaders;
+	my ($uploaders, $orig_uploaders) = $self->handle_maintainer_fields($data);
+	$self->{uploaders} = $uploaders;
+	$self->{orig_uploaders} = $orig_uploaders if @$orig_uploaders;
 
 	if ($data->{files}) {
 	    my @files = split /\01/so, $data->{files};
@@ -65,6 +53,8 @@ sub merge_package {
 
 	$self->{version} = $data->{version};
     }
+
+    return 1;
 }
 
 #FIXME: should be mergable with the Packages::Page version