Merge branch 'master' into ubuntu-master

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

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index fd19f0f058e30c620fbef439a65b91162af04e59..48fece9f2a3951cf0e5c72dc1640c6fc1d9412a8 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -58,6 +58,10 @@ sub do_search_contents {
        # full filename search is tricky
        my $ffn = $mode eq 'filename';
 
+       unless (-e "$DBDIR/contents/reverse_$suite.db") {
+           fatal_error($cat->g("No contents information available for this suite"));
+           return;
+       }
        my $reverses = tie my %reverses, 'DB_File', "$DBDIR/contents/reverse_$suite.db",
            O_RDONLY, 0666, $DB_BTREE
            or die "Failed opening reverse DB: $!";
@@ -117,7 +121,7 @@ sub do_search_contents {
     $page_content->{suite} = $suite;
     $page_content->{archive} = $archive;
     $page_content->{all_architectures} = \@all_archs;
-    $page_content->{all_suites} = \@SUITES;
+    $page_content->{all_suites} = [ grep { $_ !~ /-(updates|backports)$/ } @SUITES ];
     $page_content->{mode} = $mode;
     $page_content->{search_architectures} = $opts->{arch};
     $page_content->{search_keywords} = $opts->{keywords};