Author: dmacvicar Date: Sun Apr 13 03:19:34 2008 New Revision: 9582 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9582&view=rev Log: fix compile and display of patches Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-misc.h Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=9582&r1=9581&r2=9582&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Sun Apr 13 03:19:34 2008 @@ -349,7 +349,7 @@ } -static void +void mark_by_name (Zypper & zypper, bool install_not_remove, const ResObject::Kind &kind, @@ -1415,7 +1415,8 @@ for (; it != e; ++it ) { ResObject::constPtr res = it->resolvable(); - if ( it->isBroken() ) + + if ( it->isRelevant() && ! it->isSatisfied() ) { Patch::constPtr patch = asKind<Patch>(res); @@ -1426,7 +1427,7 @@ tr << patch->category(); if (!it->isSatisfied()) - tr << _("Needed"); + tr << _("Needed"); if (patch->affects_pkg_manager ()) pm_tbl << tr; Modified: trunk/zypper/src/zypper-misc.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.h?rev=9582&r1=9581&r2=9582&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.h (original) +++ trunk/zypper/src/zypper-misc.h Sun Apr 13 03:19:34 2008 @@ -42,7 +42,6 @@ bool install_not_remove, const zypp::ResObject::Kind &kind, const std::string &capstr); ->>>>>>> fix displaying uninstalled patches:zypper/src/zypper-misc.h /** * Reset all selections made by mark_* methods. Needed in the shell to reset -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org