[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-575-gb9f1ee3

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 3e2e3d70867be455d5562c017863420f5bc593ef
Merge: 4c6f8d14803ae5c0af92b5e696363afe0c64f95a 
a03f40020435a3fc1bca19e8cc4d3613ff6e882f
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date:   Sat Jun 21 01:25:36 2008 +0200

    Merge branch 'master' into ubuntu-master

diff --combined lib/Packages/SrcPage.pm
index 433bb9d,62e8f7f..101d6f2
--- a/lib/Packages/SrcPage.pm
+++ b/lib/Packages/SrcPage.pm
@@@ -38,9 -38,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} = [EMAIL PROTECTED];
 +      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};
@@@ -53,6 -64,8 +53,8 @@@
  
        $self->{version} = $data->{version};
      }
+ 
+     return 1;
  }
  
  #FIXME: should be mergable with the Packages::Page version

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]