diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-18 14:34:24 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-18 14:34:24 +0400 |
| commit | 46743b1551b70fef63174c770e7b05ada10f96f6 (patch) | |
| tree | 19ab5d1e3b27839406934425f6389d8262861f19 /apt-private/private-search.cc | |
| parent | ffa090bbd5d0b889d427d85e4b687ca7e1de2a47 (diff) | |
| parent | 5803c1dcf0a6e590cfd98ca8ab11d5573652cb14 (diff) | |
| download | apt-46743b1551b70fef63174c770e7b05ada10f96f6.tar.gz | |
Merge branch 'debian/sid' of git://anonscm.debian.org/apt/apt
Conflicts:
.gitignore
Makefile
apt-inst/makefile
apt-pkg/install-progress.h
apt-pkg/makefile
buildlib/defaults.mak
buildlib/environment.mak.in
buildlib/library.mak
buildlib/po4a_manpage.mak
buildlib/program.mak
buildlib/python.mak
buildlib/staticlibrary.mak
cmdline/makefile
configure.ac
debian/apt.install.in
debian/changelog
debian/control
debian/libapt-pkg4.12.symbols
debian/rules
doc/makefile
ftparchive/makefile
po/ar.po
po/bs.po
po/cy.po
po/dz.po
po/el.po
po/fi.po
po/km.po
po/ku.po
po/lt.po
po/ne.po
po/nn.po
po/pt_BR.po
po/ro.po
po/th.po
po/tl.po
po/uk.po
test/libapt/makefile
Diffstat (limited to 'apt-private/private-search.cc')
| -rw-r--r-- | apt-private/private-search.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc index 8106333b..ecd5d7fa 100644 --- a/apt-private/private-search.cc +++ b/apt-private/private-search.cc @@ -68,8 +68,12 @@ bool FullTextSearch(CommandLine &CmdL) /*{{{*/ const char *pattern = patterns[i]; all_found &= ( strstr(V.ParentPkg().Name(), pattern) != NULL || - parser.ShortDesc().find(pattern) != std::string::npos || - parser.LongDesc().find(pattern) != std::string::npos); + strcasestr(parser.ShortDesc().c_str(), pattern) != NULL || + strcasestr(parser.LongDesc().c_str(), pattern) != NULL); + // search patterns are AND by default so we can skip looking further + // on the first mismatch + if(all_found == false) + break; } if (all_found) { |