Author: jkupec Date: Mon May 5 14:21:53 2008 New Revision: 9947 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9947&view=rev Log: - search: reenable multiple search strings, --match-words, wildcards Modified: trunk/zypper/src/zypper.cc trunk/zypper/zypper.spec.cmake Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9947&r1=9946&r2=9947&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Mon May 5 14:21:53 2008 @@ -2495,7 +2495,8 @@ if (copts.count("installed-only")) query.setInstalledOnly(); //if (copts.count("match-any")) options.setMatchAny(); - //if (copts.count("match-words")) options.setMatchWords(); + if (copts.count("match-words")) + query.setMatchWord(); if (copts.count("match-exact")) query.setMatchExact(); if (copts.count("case-sensitive")) @@ -2537,14 +2538,17 @@ for(vector<string>::const_iterator it = _arguments.begin(); it != _arguments.end(); ++it) + { query.addString(*it); + if (!query.matchGlob() && it->find_first_of("?*") != string::npos) + query.setMatchGlob(); + } query.addAttribute(sat::SolvAttr::name); if (cOpts().count("search-descriptions")) { query.addAttribute(sat::SolvAttr::summary); query.addAttribute(sat::SolvAttr::description); } - //query.setMatchGlob(); \todo switch this on if the input contains * or ? init_target(*this); Modified: trunk/zypper/zypper.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/zypper.spec.cmake?rev=9947&r1=9946&r2=9947&view=diff ============================================================================== --- trunk/zypper/zypper.spec.cmake (original) +++ trunk/zypper/zypper.spec.cmake Mon May 5 14:21:53 2008 @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 4.18.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 +BuildRequires: libzypp-devel >= 4.19.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps Recommends: logrotate cron -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org