Author: jkupec Date: Tue May 20 13:18:21 2008 New Revision: 10160 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10160&view=rev Log: - show correct available version (bnc #386703) - look for exact package name matches, not substrings Modified: trunk/zypper/src/zypper-info.cc Modified: trunk/zypper/src/zypper-info.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-info.cc?rev=10160&r1=10159&r2=10160&view=diff ============================================================================== --- trunk/zypper/src/zypper-info.cc (original) +++ trunk/zypper/src/zypper-info.cc Tue May 20 13:18:21 2008 @@ -59,31 +59,15 @@ for(vector<string>::const_iterator nameit = zypper.arguments().begin(); nameit != zypper.arguments().end(); ++nameit ) { - - // find the resolvable among installed - /* - PoolItem installed; - for_( it, pool.byIdentBegin( kind, *nameit ), - pool.byIdentEnd( kind, *nameit ) ) - { - if (it->status().isInstalled()) { installed = *it; break; } - } -*/ - // find installation candidate -// ProvideProcess installer (ZConfig::instance().systemArchitecture(), "" /*version*/); PoolQuery q; q.addKind(kind); q.addAttribute(sat::SolvAttr::name, *nameit); - /* - invokeOnEach( pool.byIdentBegin( kind, *nameit ), - pool.byIdentEnd( kind, *nameit ), - zypp::functor::functorRef (installer) ); -*/ - - //if (!installer.item) { + q.setMatchExact(); + if (q.empty()) { // TranslatorExplanation E.g. "package 'zypper' not found." + //! \todo use a separate string for each kind so that it is translatable. cout << "\n" << format(_("%s '%s' not found.")) % kind_to_string_localized(kind, 1) % *nameit << endl; @@ -111,7 +95,7 @@ cout << format(_("Info for type '%s' not implemented.")) % kind << endl; } } - + if (false) { string s00 = _("None"); @@ -155,7 +139,7 @@ cout << (zypper.globalOpts().is_rug_compatible ? _("Catalog: ") : _("Repository: ")) << theone.resolvable()->repository().info().name() << endl; - printNVA(installed ? installed.resolvable() : theone.resolvable()); + printNVA(theone.resolvable()); cout << _("Installed: ") << (installed ? _("Yes") : _("No")) << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org