Simply some stuff due to (suite,arch) now being unique and $archive being

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

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 08eb376d236ddb237999af2258cae7048eabb64d..c9940a16bfc980af9a75cca6852a7108b90b4b94 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -75,19 +75,13 @@ sub do_show {
            foreach (@results, @non_results) {
                my $a = $_->[1];
                my $s = $_->[2];
-               if ($a =~ /^(?:us|security|non-US)$/o) {
-                   $all_suites{$s}++;
-               } else {
-                   $all_suites{"$s/$a"}++;
-               }
+               $all_suites{$s}++;
            }
            foreach (suites_sort(keys %all_suites)) {
-               if (("$suite/$archive" eq $_)
-                   || (!$all_suites{"$suite/$archive"} && ($suite eq $_))) {
+               if ($suite eq $_) {
                    $$menu .= "[ <strong>$_</strong> ] ";
                } else {
-                   $$menu .=
-                       "[ <a href=\"$ROOT/$_/$encodedpkg\">$_</a> ] ";
+                   $$menu .= "[ <a href=\"$ROOT/$_/$encodedpkg\">$_</a> ] ";
                }
            }
            $$menu .= '<br>';
@@ -163,7 +157,7 @@ sub do_show {
 
                        my $v_str = $version;
                        my $multiple_versions = grep { $_ ne $version } values %$versions;
-                       $v_str .= " (and others)" if $multiple_versions;
+                       $v_str .= _g(" and others") if $multiple_versions;
                        my $title .= sprintf( _g( "Package: %s (%s)" ), $pkg, $v_str );
                        $title .=  " ".marker( $archive ) if $archive ne 'us';
                        $title .=  " ".marker( $subsection ) if $subsection eq 'non-US'