Packages::Dispatcher: Work around breakage in etch's CGI.pm

[deb/packages.git] / lib / Packages / Page.pm

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index c3e20d24e94393580d6209ea46f93e4cb1014e42..946a5a4f801d91e30f82c39c77fb53a6dfdb8a49 100644 (file)
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -94,10 +94,10 @@ sub is_virtual {
     return (exists($self->{provided_by}) && !exists($self->{versions}));
 }
 
-our @TAKE_NEWEST = qw( description essential priority section subsection tag
-                      archive source source-version );
+our @TAKE_NEWEST = qw( description description-md5 essential priority section subsection tag
+                      archive source source-version url homepage );
 our @STORE_ALL = qw( version source source-version installed-size size
-                    filename md5sum
+                    filename md5sum sha1 sha256 task
                     origin bugs suite archive section );
 our @DEP_FIELDS = qw( depends pre-depends recommends suggests enhances
                      provides conflicts );
@@ -109,6 +109,7 @@ sub merge_package {
     ($self->{package} eq $data->{package}) || return;
     debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 ) if DEBUG;
 
+    (my $version = $data->{version}) =~ s/\+b\d+$//o; # strip binNMU number
     unless ($self->{newest}) {
        debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 ) if DEBUG;
        foreach my $key (@TAKE_NEWEST) {
@@ -121,16 +122,19 @@ sub merge_package {
        foreach my $key (@DEP_FIELDS) {
            $self->normalize_dependencies($key, $data);
        }
-       $self->{newest} = $data->{version};
+       $self->{newest} = $version;
        
         return 1;
     }
 
     debug( "package $data->{package}/$data->{version}/$data->{architecture} is subsequent merge", 3 ) if DEBUG;
     my $is_newest;
-    if ($is_newest =
-       (version_cmp( $data->{version}, $self->{newest} ) > 0)) {
-       $self->{newest} = $data->{version};
+    my $cmp = version_cmp( $version, $self->{newest} );
+    # packages from the central archive are preferred over all
+    # others with the same version number but from other archives
+    if ($is_newest = ($cmp > 0)
+               || (!$cmp && ($data->{archive} eq 'us') && ($self->{data}{archive} ne 'us'))) {
+       $self->{newest} = $version;
        foreach my $key (@TAKE_NEWEST) {
            $self->{data}{$key} = $data->{$key};
        }
@@ -212,6 +216,42 @@ sub get_arch_field {
     return \%result;
 }
 
+sub get_versions {
+    my ($self) = @_;
+
+    my %versions;
+    foreach (keys %{$self->{versions}}) {
+       my $version = $self->{versions}{$_}{version};
+       $versions{$version} ||= [];
+       push @{$versions{$version}}, $_;
+    }
+
+    return \%versions;
+}
+
+sub get_version_string {
+    my ($self) = @_;
+
+    my $versions = $self->get_versions;
+    my @versions = version_sort keys %$versions;
+    my (@v_str, $v_str, $v_str_arch);
+    if ( scalar @versions == 1 ) {
+       @v_str = ( [ $versions[0], undef ] );
+       $v_str = $versions[0];
+       $v_str_arch = $versions[0];
+    } else {
+       my @v_str_arch;
+       foreach ( @versions ) {
+           push @v_str, [ $_, $versions->{$_} ];
+           push @v_str_arch, "$_ [".join(', ', sort @{$versions->{$_}})."]";
+       }
+       $v_str_arch = join( ", ", @v_str_arch );
+       $v_str = join( ", ",  @versions );
+    }
+
+    return ($v_str, $v_str_arch, \@v_str);
+}
+
 sub get_dep_field {
     my ($self, $dep_field) = @_;