X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=51c97e72d0e562127ee14d575457cfcc6d028313;hp=1f8a0178c7ea1e81a83b7020d717b3aa8662dff3;hb=9dab5dc6d6a13ef40fa93c626f06b20d2c979189;hpb=7a5ca633d65f3e890f74aa8aba17accbc17ac432

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 1f8a017..51c97e7 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -14,7 +14,7 @@ use Deb::Versions;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS
 			 @ARCHITECTURES %FTP_SITES @DDTP_LANGUAGES);
 use Packages::I18N::Locale;
-use Packages::CGI qw( :DEFAULT make_url make_search_url note );
+use Packages::CGI qw( :DEFAULT make_url make_search_url );
 use Packages::DB;
 use Packages::Search qw( :all );
 use Packages::Page ();
@@ -68,8 +68,8 @@ sub do_show {
 	}
 
 	unless (@results || @non_results ) {
-	    fatal_error( _g( "No such package." )."<br>".
-			 sprintf( _g( '<a href="%s">Search for the package</a>' ), make_search_url('','keywords='.uri_escape($pkg)) ) );
+	    fatal_error( _g( "No such package.") );
+	    #sprintf( _g( '<a href="%s">Search for the package</a>' ), make_search_url('','keywords='.uri_escape($pkg)) ) );
 	} else {
 	    my %all_suites;
 	    foreach (@results, @non_results) {
@@ -306,8 +306,7 @@ sub do_show {
 		    foreach( @$source_files ) {
 			my ($src_file_md5, $src_file_size, $src_file_name)
 			    = split /\s+/, $_;
-			(my $server = lc $archive) =~ s/-//go; # non-US hack
-			$server = $FTP_SITES{$server}
+			my $server = $FTP_SITES{lc $archive}
 			    || $FTP_SITES{us};
 			my $path = "/$source_dir/$src_file_name";
 
@@ -361,9 +360,7 @@ sub moreinfo {
 	    foreach( @$files ) {
 		my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
 		my ($server, $path);
-		# non-US hack
-		($server = lc $page->get_newest('archive')) =~ s/-//go;
-		$server = $env->{$server}||$env->{us};
+		$server = $env->{lc $page->get_newest('archive')}||$env->{us};
 		$path = "/$src_dir/$src_file_name";
 		push @downloads, { name => $src_file_name, server => $server, path => $path };
 	    }
@@ -376,7 +373,6 @@ sub moreinfo {
 	    (my $src_basename = $source_version) =~ s,^\d+:,,; # strip epoche
 	    $src_basename = "${source}_$src_basename";
 	    $src_dir =~ s,pool/updates,pool,o;
-	    $src_dir =~ s,pool/non-US,pool,o;
 
 	    $contents->{files}{changelog}{path} = "$src_dir/$src_basename/changelog";
 	    $contents->{files}{copyright}{path} = "$src_dir/$src_basename/".( $is_source ? 'copyright' : "$name.copyright" );