X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=6f8a71ce8a300c9b2b840f98f4abcbd7858cf640;hb=3f085acbf01251255c4f6e4786b0439ff424d979;hp=e3e1945b6b7cc7123e4705a47f681e79f16106f1;hpb=8d29452530e823cbcd07a30898e98abe565a046c;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index e3e1945..6f8a71c 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -82,7 +82,7 @@ sub do_show {
 		if ($suite eq $_) {
 		    $$menu .= "[ <strong>$_</strong> ] ";
 		} else {
-		    $$menu .= "[ <a href=\"".make_url($encodedpkg,'',{suite=>$suite})."\">$_</a> ] ";
+		    $$menu .= "[ <a href=\"".make_url($encodedpkg,'',{suite=>$_})."\">$_</a> ] ";
 		}
 	    }
 	    $$menu .= '<br>';
@@ -152,7 +152,6 @@ sub do_show {
 				       _g( "All packages in this section" ),
 				       make_url("$subsection/",''),
 				       $subsection ], );
-			my $source = $page->get_src('package');
 			push @menu, [ _g( "Source:" ),
 				      _g( "Source package building this package" ),
 				      make_url($source,'',{source=>'source'}),
@@ -383,19 +382,9 @@ sub do_show {
 		    foreach( @$source_files ) {
 			my ($src_file_md5, $src_file_size, $src_file_name)
 			    = split /\s+/, $_;
-			my $src_url;
-			for ("$suite/$archive") {
-			    /security/o &&  do {
-				$src_url = $FTP_SITES{security}; last };
-			    /volatile/o &&  do {
-				$src_url = $FTP_SITES{volatile}; last };
-			    /backports/o &&  do {
-
-				$src_url = $FTP_SITES{backports}; last };
-			    /non-us/io  &&  do {
-				$src_url = $FTP_SITES{'non-US'}; last };
-			    $src_url = $FTP_SITES{us};
-			}
+			(my $server = lc $archive) =~ s/-//go; # non-US hack
+			my $src_url = $FTP_SITES{$server}
+			    || $FTP_SITES{us};
 			$src_url .= "/$source_dir/$src_file_name";
 			
 			$package_page .= "<tr><td><a href=\"$src_url\">$src_file_name</a></td>\n"