Author: dmacvicar Date: Tue May 13 17:38:38 2008 New Revision: 10076 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10076&view=rev Log: report non packages as keep installed if satisfied to the user interace (Selectables) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/zypp/ui/SelectableImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10076&r1=10075&r2=10076&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue May 13 17:38:38 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "21") SET(LIBZYPP_COMPATMINOR "21") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") Modified: trunk/libzypp/zypp/ui/SelectableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.cc?rev=10076&r1=10075&r2=10076&view=diff ============================================================================== --- trunk/libzypp/zypp/ui/SelectableImpl.cc (original) +++ trunk/libzypp/zypp/ui/SelectableImpl.cc Tue May 13 17:38:38 2008 @@ -183,6 +183,12 @@ if ( !installedObj() && allCandidatesLocked() ) return S_Taboo; + // non packages are handled differently + if ( ! isKind<Package>(cand.resolvable()) ) + { + return( cand.status().isSatisfied() ? S_KeepInstalled : S_NoInst ); + } + return( installedObj() ? S_KeepInstalled : S_NoInst ); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org