X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoSearchContents.pm;h=1be7d441cc90e25c6da65a0b855a2916d809e8ff;hb=42a5a96dd0c539135f2e1cb044a91f9e2f441f5f;hp=2da76d6c8e03c1976733e9eefbcbfb65f0053a7c;hpb=ec25a53e13c79803a1fcfda386f47add2192fbf9;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 2da76d6..1be7d44 100644
--- 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';