Author: mlandres Date: Fri Oct 31 14:08:06 2008 New Revision: 11558 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11558&view=rev Log: - Do not save solver locks (by APPL_HIGH). Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/ResStatus.h trunk/libzypp/zypp/pool/PoolImpl.h Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11558&r1=11557&r2=11558&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Oct 31 14:08:06 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 31 14:01:57 CET 2008 - ma@suse.de + +- Do not save solver locks (by APPL_HIGH). +- revision 11558 + +------------------------------------------------------------------- Fri Oct 31 13:53:39 CET 2008 - dmacvicar@suse.de - fetcher.setOptions( Fetcher::AutoAddIndexes ) allows Modified: trunk/libzypp/zypp/ResStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=11558&r1=11557&r2=11558&view=diff ============================================================================== --- trunk/libzypp/zypp/ResStatus.h (original) +++ trunk/libzypp/zypp/ResStatus.h Fri Oct 31 14:08:06 2008 @@ -253,6 +253,9 @@ bool isLocked() const { return fieldValueIs<TransactField>( LOCKED ); } + bool isUserLocked() const + { return isLocked() && isByUser(); } + bool isSoftLocked( TransactByValue causer_r = USER ) const { return isKept() && fieldValueIs<TransactByField>( causer_r ); } Modified: trunk/libzypp/zypp/pool/PoolImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/pool/PoolImpl.h?rev=11558&r1=11557&r2=11558&view=diff ============================================================================== --- trunk/libzypp/zypp/pool/PoolImpl.h (original) +++ trunk/libzypp/zypp/pool/PoolImpl.h Fri Oct 31 14:08:06 2008 @@ -61,9 +61,10 @@ /** Test whether the lock status differs from the remembered UserLockQuery bit. */ static int diffLock( const ResStatus & status_r ) { - if ( status_r.isLocked() == status_r.isUserLockQueryMatch() ) + bool userLock( status_r.isUserLocked() ); + if ( userLock == status_r.isUserLockQueryMatch() ) return 0; - return status_r.isLocked() ? 1 : -1; + return userLock ? 1 : -1; } }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org