X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=417c97ef68f8baf90d41fc2806333abdfe9ab2ed;hb=5b187d705a2e3e2e3baf636fa24f129ec451eda6;hp=000f1a0c24bfcaaad9a33236b5f08fb024fd2371;hpb=b21dd56695db580574c998f2f9ca59e18d168c06;p=deb%2Fpackages.git

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index 000f1a0..417c97e 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -128,12 +128,16 @@ sub merge_package {
 
     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)) {
+    my $cmp = version_cmp( $data->{version}, $self->{newest} );
+    if ($is_newest = ($cmp > 0)) {
 	$self->{newest} = $data->{version};
 	foreach my $key (@TAKE_NEWEST) {
 	    $self->{data}{$key} = $data->{$key};
 	}
+    } elsif (($cmp == 0) &&
+	     $self->{data}{archive} ne 'us') {
+	#FIXME crude hack to prefer us archive over others
+	$self->{data}{archive} = $data->{archive};
     }
     debug( "is_newest= ".($is_newest||0), 3 ) if DEBUG;
     if (!$self->{versions}{$data->{architecture}}