X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=c3e20d24e94393580d6209ea46f93e4cb1014e42;hb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;hp=201408fb5c9484fdfd77e6c299aff48c16f1d4b2;hpb=56d4b3ed57e20359e5ea46feabb850cf4a94caf2;p=deb%2Fpackages.git

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index 201408f..c3e20d2 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -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,7 +126,7 @@ 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)) {
@@ -135,7 +135,7 @@ sub merge_package {
 	    $self->{data}{$key} = $data->{$key};
 	}
     }
-    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},
@@ -212,42 +212,6 @@ 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(', ', @{$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) = @_;
 
@@ -257,14 +221,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 ) {