Author: mlandres Date: Thu Aug 14 14:04:31 2008 New Revision: 10850 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10850&view=rev Log: - Let Selectable default to USER level. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/ui/Selectable.h trunk/libzypp/zypp/ui/SelectableImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10850&r1=10849&r2=10850&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Aug 14 14:04:31 2008 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "5") SET(LIBZYPP_MINOR "5") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 5.5.0 (5) +# LAST RELEASED: 5.5.1 (5) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.cc?rev=10850&r1=10849&r2=10850&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Thu Aug 14 14:04:31 2008 @@ -268,6 +268,11 @@ return true; } +void testcase() +{ + getZYpp()->resolver()->createSolverTestcase( "./solverTestcase" ); +} + /////////////////////////////////////////////////////////////////// struct DigestReceive : public callback::ReceiveReport<DigestReport> @@ -523,11 +528,8 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - - ui::Selectable::Ptr item( ui::Selectable::get( "amarok" ) ); - item->setUpToDate(); - SEC << dump(item) << endl; - install(); + testcase(); + MIL << "FOOO" << endl; /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=10850&r1=10849&r2=10850&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Aug 14 14:04:31 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 14 14:03:27 CEST 2008 - ma@suse.de + +- Let Selectable default to USER level. +- revision 10850 +- version 5.5.1 (5) + +------------------------------------------------------------------- Wed Aug 13 21:01:25 CEST 2008 - ma@suse.de - Change Selectable API to support doing staus manipulation on Modified: trunk/libzypp/zypp/ui/Selectable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/Selectable.h?rev=10850&r1=10849&r2=10850&view=diff ============================================================================== --- trunk/libzypp/zypp/ui/Selectable.h (original) +++ trunk/libzypp/zypp/ui/Selectable.h Thu Aug 14 14:04:31 2008 @@ -254,27 +254,27 @@ { return fate() == TO_INSTALL; } /** */ - bool setFate( Fate fate_r, ResStatus::TransactByValue causer_r /*= ResStatus::USER*/ ); + bool setFate( Fate fate_r, ResStatus::TransactByValue causer_r = ResStatus::USER ); /** Set the item to be installed (new- or re-install). */ - bool setToInstall( ResStatus::TransactByValue causer_r /*= ResStatus::USER*/ ) + bool setToInstall( ResStatus::TransactByValue causer_r = ResStatus::USER ) { return setFate( TO_INSTALL, causer_r ); } /** Take care the item gets installed if it is not. */ - bool setInstalled( ResStatus::TransactByValue causer_r /*= ResStatus::USER*/ ); + bool setInstalled( ResStatus::TransactByValue causer_r = ResStatus::USER ); /** Take care the item gets installed if it is not, or is older. */ - bool setUpToDate( ResStatus::TransactByValue causer_r /*= ResStatus::USER*/ ); + bool setUpToDate( ResStatus::TransactByValue causer_r = ResStatus::USER ); /** Set the item to be deleted (must be installed). */ - bool setToDelete( ResStatus::TransactByValue causer_r /*= ResStatus::USER*/ ) + bool setToDelete( ResStatus::TransactByValue causer_r = ResStatus::USER ) { return setFate( TO_DELETE, causer_r ); } /** Take care the item gets deleted if it is installed. */ - bool setDeleted( ResStatus::TransactByValue causer_r /*= ResStatus::USER*/ ); + bool setDeleted( ResStatus::TransactByValue causer_r = ResStatus::USER ); /** Set the item to stay unmodified. */ - bool unset( ResStatus::TransactByValue causer_r /*= ResStatus::USER*/ ) + bool unset( ResStatus::TransactByValue causer_r = ResStatus::USER ) { return setFate( UNMODIFIED, causer_r ); } //@} @@ -293,7 +293,7 @@ * Try to set a new Status. * Returns \c false if the transitions is not allowed. */ - bool setStatus( const Status state_r, ResStatus::TransactByValue causer_r /*= ResStatus::USER*/ ); + bool setStatus( const Status state_r, ResStatus::TransactByValue causer_r = ResStatus::USER ); /** Return who caused the modification. */ ResStatus::TransactByValue modifiedBy() const; Modified: trunk/libzypp/zypp/ui/SelectableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.cc?rev=10850&r1=10849&r2=10850&view=diff ============================================================================== --- trunk/libzypp/zypp/ui/SelectableImpl.cc (original) +++ trunk/libzypp/zypp/ui/SelectableImpl.cc Thu Aug 14 14:04:31 2008 @@ -31,7 +31,7 @@ */ struct StatusHelper { - StatusHelper( const Selectable::Impl & impl ) + StatusHelper( const Selectable::Impl & impl, ResStatus::TransactByValue causer_r ) : _impl( impl ) , inst( impl.installedObj() ) , cand( impl.candidateObj() ) @@ -198,7 +198,7 @@ bool Selectable::Impl::setStatus( const Status state_r, ResStatus::TransactByValue causer_r ) { - StatusHelper self( *this ); + StatusHelper self( *this, causer_r ); switch ( state_r ) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org