Move $debug_allowed to CGI as a real constant and modify all debug() calls

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

diff --git a/lib/Packages/SrcPage.pm b/lib/Packages/SrcPage.pm
index b1d83d4cc761dec729765348adebec41c6371ae5..a10a2c2364cf2b7d54b28d9771935dd85d192664 100644 (file)
--- a/lib/Packages/SrcPage.pm
+++ b/lib/Packages/SrcPage.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use Data::Dumper;
+use Locale::gettext;
 use Deb::Versions;
 use Packages::CGI;
 use Packages::Page qw( :all );
@@ -22,8 +23,6 @@ sub merge_data {
     return $self->merge_package( \%data );
 }
 
-sub gettext { return $_[0]; }
-
 our @DEP_FIELDS = qw( build-depends build-depends-indep
                      build-conflicts build-conflicts-indep);
 sub merge_package {
@@ -32,11 +31,11 @@ sub merge_package {
     ($data->{package} && $data->{suite} && $data->{archive}) || return;
     $self->{package} ||= $data->{package};
     ($self->{package} eq $data->{package}) || return;
-    debug( "merge package $data->{package}/$data->{version} into $self (".($self->{version}||'').")", 2 );
+    debug( "merge package $data->{package}/$data->{version} into $self (".($self->{version}||'').")", 2 ) if DEBUG;
 
     if (!$self->{version}
        || (version_cmp( $data->{version}, $self->{version} ) > 0)) {
-       debug( "added package is newer, replacing old information" );
+       debug( "added package is newer, replacing old information" ) if DEBUG;
 
        $self->{data} = $data;
 
@@ -94,20 +93,6 @@ sub get_arch_field {
     return $self->{data}{$field};
 }
 
-sub get_versions {
-    my ($self) = @_;
-
-    return [ $self->{version} ];
-}
-
-sub get_version_string {
-    my ($self) = @_;
-
-    my $versions = $self->get_versions;
-
-    return ($self->{version}, $versions);
-}
-
 sub get_dep_field {
     my ($self, $dep_field) = @_;