Support multiple keywords

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

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index fb16d2fdc66837214586de6ceda1648e747bfc3f..6a6baf6c9e4055241d577ae97b97801cf5cce21b 100644 (file)
--- 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 {
@@ -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 ) {