Packages::Sections: Add translations section

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

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 2da76d6c8e03c1976733e9eefbcbfb65f0053a7c..1be7d441cc90e25c6da65a0b855a2916d809e8ff 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -14,7 +14,7 @@ our @EXPORT = qw( do_search_contents );
 use Deb::Versions;
 use Packages::I18N::Locale;
 use Packages::Search qw( :all );
-use Packages::CGI;
+use Packages::CGI qw( :DEFAULT error );
 use Packages::DB;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @ARCHITECTURES $ROOT );
 
@@ -75,6 +75,7 @@ sub do_search_contents {
                &searchfile(\@results, reverse($_)."/", \$nres, $reverses);
                last if $Packages::Search::too_many_hits;
            }
+           while (<FILENAMES>) {};
            close FILENAMES or warn "fgrep error: $!\n";
        } else {
 
@@ -82,6 +83,7 @@ sub do_search_contents {
                if @keywords;
 
            my $kw = reverse $first_kw;
+           $kw =~ s{/+$}{};
 
            # exact filename searching follows trivially:
            $kw = "$kw/" if $mode eq 'exactfilename';