Author: dmacvicar Date: Sun Apr 13 03:09:52 2008 New Revision: 9578 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9578&view=rev Log: fix displaying uninstalled patches Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-misc.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=9578&r1=9577&r2=9578&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Sun Apr 13 03:09:52 2008 @@ -1195,7 +1195,7 @@ * * \return <tt>true</tt> if a solution has been found, <tt>false</tt> otherwise */ -static bool resolve(Zypper & zypper) +bool resolve(Zypper & zypper) { apply_locks(zypper); dump_pool(); // debug @@ -1424,9 +1424,9 @@ tr << patch->repoInfo().name(); tr << res->name () << res->edition ().asString(); tr << patch->category(); - tr << string_status (it->status ()); - if (it->isBroken()) - tr << _("Broken"); + + if (!it->isSatisfied()) + 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=9578&r1=9577&r2=9578&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.h (original) +++ trunk/zypper/src/zypper-misc.h Sun Apr 13 03:09:52 2008 @@ -22,13 +22,28 @@ zypp::ResObject::Kind string_to_kind (const std::string &skind); /** + * Run the solver. * + * \return <tt>true</tt> if a solution has been found, <tt>false</tt> otherwise */ +bool resolve(Zypper & zypper); + void install_remove(Zypper & zypper, const Zypper::ArgList & args, bool install_not_remove, const zypp::ResKind & kind); +void mark_by_name (Zypper & zypper, + bool install_not_remove, + const zypp::ResObject::Kind &kind, + const std::string &name); + +void mark_by_capability (Zypper & zypper, + 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 * selections after the install and remove commands. Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9578&r1=9577&r2=9578&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Sun Apr 13 03:09:52 2008 @@ -2230,7 +2230,8 @@ if (exitCode() != ZYPPER_EXIT_OK) return; load_resolvables(*this); - + resolve(*this); + list_updates(*this, kinds, best_effort); return; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org