Clean-up behind Jeroen :)

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

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index e550fcc372556e7ffc7bb49ec63d1e437eaf77a4..417c97ef68f8baf90d41fc2806333abdfe9ab2ed 100644 (file)
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -5,6 +5,7 @@ use warnings;
 
 use Data::Dumper;
 use Exporter;
+use Locale::gettext;
 use Deb::Versions;
 use Packages::CGI;
 
@@ -33,7 +34,6 @@ sub new {
     return $self;
 }
 
-sub gettext { return $_[0]; }
 sub split_name_mail {
     my $string = shift;
     my ( $name, $email );
@@ -88,7 +88,7 @@ sub add_provided_by {
     push @{$self->{provided_by}}, @$provided_by;
 }
 
-sub is_virutal {
+sub is_virtual {
     my ($self) = @_;
 
     return (exists($self->{provided_by}) && !exists($self->{versions}));
@@ -107,10 +107,10 @@ sub merge_package {
     ($data->{package} && $data->{version} && $data->{architecture}) || return;
     $self->{package} ||= $data->{package};
     ($self->{package} eq $data->{package}) || return;
-    debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 );
+    debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 ) if DEBUG;
 
     unless ($self->{newest}) {
-       debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 );
+       debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 ) if DEBUG;
        foreach my $key (@TAKE_NEWEST) {
            $self->{data}{$key} = $data->{$key};
        }
@@ -126,16 +126,20 @@ sub merge_package {
         return 1;
     }
 
-    debug( "package $data->{package}/$data->{version}/$data->{architecture} is subsequent merge", 3 );
+    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 );
+    debug( "is_newest= ".($is_newest||0), 3 ) if DEBUG;
     if (!$self->{versions}{$data->{architecture}}
        || $is_newest
        || (version_cmp( $data->{version},
@@ -257,14 +261,14 @@ sub get_dep_field {
     foreach my $a ( @architectures ) {
        next unless exists $self->{dep_fields}{$a}{$dep_field};
        my ($a_deps_norm, $a_deps) = @{$self->{dep_fields}{$a}{$dep_field}};
-#      debug( "get_dep_field: $dep_field/$a: ".Dumper($a_deps_norm,$a_deps), 3 );
+#      debug( "get_dep_field: $dep_field/$a: ".Dumper($a_deps_norm,$a_deps), 3 ) if DEBUG;
        for ( my $i=0; $i < @$a_deps; $i++ ) { # splitted by ,      
            $dep_pkgs{$a_deps_norm->[$i]} = $a_deps->[$i];
            $arch_deps{$a}{$a_deps_norm->[$i]}++;
        }
     }
     @architectures = sort keys %arch_deps;
- #   debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 );
+ #   debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 ) if DEBUG;
     
     my @deps;
     if ( %dep_pkgs ) {