X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=c7dfd0b7479d6c420a52e88dbd4f4b4d867da23c;hb=38aca122efcdfa5282e2fb1ec911d4085a6067bf;hp=fb16d2fdc66837214586de6ceda1648e747bfc3f;hpb=ab47ae363dddbc35743572c62fae6350dcb7cf96;p=deb%2Fpackages.git

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index fb16d2f..c7dfd0b 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -136,17 +136,10 @@ sub pmoreinfo {
 	} else {
 	    foreach( @$files ) {
 		my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
-		for ("$suite/".$page->get_newest('archive')) {
-		    /security/o && do {
-			$str .= "<a href=\"$env->{security}/$src_dir/$src_file_name\">["; last };
-		    /volatile/o && do {
-			$str .= "<a href=\"$env->{volatile}/$src_dir/$src_file_name\">["; last };
-		    /backports/o && do {
-			$str .= "<a href=\"$env->{backports}/$src_dir/$src_file_name\">["; last };
-		    /non-us/io && do {
-			$str .= "<a href=\"$env->{'non-US'}/$src_dir/$src_file_name\">["; last };
- 		    $str .= "<a href=\"$env->{us}/$src_dir/$src_file_name\">[";
- 		}
+		# non-US hack
+		(my $server = lc $page->get_newest('archive')) =~ s/-//go;
+		$str .= sprintf("<a href=\"%s/$src_dir/$src_file_name\">[",
+				$env->{$server}||$env->{us});
 		if ($src_file_name =~ /dsc$/) {
 		    $str .= "dsc";
 		} else {
@@ -218,7 +211,7 @@ sub dep_item {
     my ( $suite, $name, $info, $desc ) = @_;
     my ($link, $post_link) = ('', '');
     if ($suite) {
-	$link = "<a href=\"".make_url($name,'',{suite=>$suite})."\">";
+	$link = "<a href=\"".make_url($name,'',{suite=>$suite,source=>undef})."\">";
 	$post_link = '</a>';
     }
     if ($info) {
@@ -242,7 +235,7 @@ sub provides_string {
     my $short_desc = $also ? _g("also a virtual package provided by ")
 	: _g("virtual package provided by ");
     if (@provided_by < 10) {
-	$short_desc .= join( ', ',map { "<a href=\"".make_url($_,'',{suite=>$suite})."\">$_</a>" } @provided_by);
+	$short_desc .= join( ', ',map { "<a href=\"".make_url($_,'',{suite=>$suite,source=>undef})."\">$_</a>" } @provided_by);
     } else {
 	$short_desc .= sprintf( _g("%s packages"), scalar(@provided_by));
     }
@@ -315,7 +308,9 @@ sub print_deps {
 		} elsif (defined $entry->[0]) {
 		    $short_desc = provides_string( $p_suite,
 						   $entry->[0] );
-		    push @res_pkgs, dep_item( $p_suite,
+		    #FIXME: we don't handle virtual packages from
+		    # the fallback suite correctly here
+		    push @res_pkgs, dep_item( $suite,
 					      $p_name, "$pkg_version$arch_str", $short_desc );
 		}
 	    } elsif ( $is_old_pkgs ) {
@@ -535,7 +530,7 @@ sub trailer {
 	"<div id=\"fineprint\" class=\"bordertop\"><p>".
 	sprintf( _g( "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</a>. For other contact information, see the Debian <a href=\"%s/contact\">contact page</a>." ), $CONTACT_MAIL, $CONTACT_MAIL, $HOME).
 	"</p>\n".
-	"<p>". _g( "Last Modified: " ). "LAST_MODIFIED_DATE".
+	"<p>". _g( "Last Modified: " ). gmtime().
 	"<br>\n".
 	sprintf( _g( "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; See <a href=\"%s/license\">license terms</a>." ), "$HOME/" )."<br>\n".
 	_g( "Debian is a registered trademark of Software in the Public Interest, Inc." ).