Author: jreidinger Date: Tue May 6 10:22:15 2008 New Revision: 9952 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9952&view=rev Log: fix saving after cleaning empty locks Modified: trunk/libzypp/zypp/Locks.cc Modified: trunk/libzypp/zypp/Locks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locks.cc?rev=9952&r1=9951&r2=9952&view=diff ============================================================================== --- trunk/libzypp/zypp/Locks.cc (original) +++ trunk/libzypp/zypp/Locks.cc Tue May 6 10:22:15 2008 @@ -48,8 +48,11 @@ LockList locks; LockList toAdd; LockList toRemove; + bool locksDirty; bool mergeList(callback::SendReport<SavingLocksReport>& report); + + Impl():locksDirty(false){} }; Locks::Locks() : _pimpl(new Impl){} @@ -291,6 +294,9 @@ report->finish(CleanEmptyLocksReport::NO_ERROR); } + + if ( sum != _pimpl->locks.size() ) //some locks has been removed + _pimpl->locksDirty = true; } class LocksRemovePredicate @@ -396,7 +402,8 @@ void Locks::save( const Pathname& file ) { - if( (_pimpl->toAdd.size() | _pimpl->toRemove.size())==0 ) + if( ((_pimpl->toAdd.size() | _pimpl->toRemove.size())==0) + || _pimpl->locksDirty ) { DBG << "nothing changed in locks - no write to file" << endl; return; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org