Author: jreidinger Date: Fri May 16 16:45:10 2008 New Revision: 10124 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10124&view=rev Log: don't run merge in save when toAdd/Remove queue is empty throw when locks cannot load its file Modified: trunk/libzypp/zypp/Locks.cc trunk/libzypp/zypp/PoolQueryUtil.tcc Modified: trunk/libzypp/zypp/Locks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locks.cc?rev=10124&r1=10123&r2=10124&view=diff ============================================================================== --- trunk/libzypp/zypp/Locks.cc (original) +++ trunk/libzypp/zypp/Locks.cc Fri May 16 16:45:10 2008 @@ -432,11 +432,16 @@ callback::SendReport<SavingLocksReport> report; report->start(); - if (!_pimpl->mergeList(report)) + + if ((_pimpl->toAdd.size() | _pimpl->toRemove.size())!=0) { - report->finish(SavingLocksReport::ABORTED); - return; + if (!_pimpl->mergeList(report)) + { + report->finish(SavingLocksReport::ABORTED); + return; + } } + DBG << "writed "<< _pimpl->locks.size() << "locks" << endl; writePoolQueriesToFile( file, _pimpl->locks.begin(), _pimpl->locks.end() ); report->finish(SavingLocksReport::NO_ERROR); Modified: trunk/libzypp/zypp/PoolQueryUtil.tcc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryUtil.tcc?rev=10124&r1=10123&r2=10124&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQueryUtil.tcc (original) +++ trunk/libzypp/zypp/PoolQueryUtil.tcc Fri May 16 16:45:10 2008 @@ -18,6 +18,7 @@ #include "zypp/Pathname.h" #include "zypp/PoolQuery.h" +#include "zypp/base/String.h" namespace zypp { @@ -39,7 +40,7 @@ std::ifstream fin( file.c_str() ); if (!fin) - return; //TODO exception + ZYPP_THROW(Exception(str::form("Cannot open file %s",file.c_str()))); do { @@ -63,7 +64,7 @@ std::ofstream fout( file.c_str(), std::ios_base::out | std::ios_base::trunc ); if (!fout) - return; //TODO exception + ZYPP_THROW(Exception(str::form("Cannot open file %s",file.c_str()))); for_( it, begin, end ) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org