[zypp-commit] r7963 - in /trunk/libzypp/zypp: sat/SATResolver.cc solver/detail/Resolver.cc

Author: schubi2 Date: Wed Nov 28 17:36:28 2007 New Revision: 7963 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7963&view=rev Log: some bugfixes, loggings Modified: trunk/libzypp/zypp/sat/SATResolver.cc trunk/libzypp/zypp/solver/detail/Resolver.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?rev=7963&r1=7962&r2=7963&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Wed Nov 28 17:36:28 2007 @@ -382,16 +382,14 @@ if (id == ID_NULL) { ERR << "Install: " << *iter << " not found" << endl; } + MIL << "Install " << *iter << " with the SAT-Pool ID: " << id << endl; queue_push( &(jobQueue), SOLVER_INSTALL_SOLVABLE ); queue_push( &(jobQueue), id ); } for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { - string packageName = str::form (_("%s:%s"), - iter->resolvable()->kind().asString().c_str(), - iter->resolvable()->name().c_str() - ); - Id id = str2id( _SATPool, packageName.c_str(), 1 ); + Id id = iter->satSolvable().id(); + MIL << "Delete " << *iter << " with the SAT-Pool ID: " << id << endl; queue_push( &(jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); queue_push( &(jobQueue), id); } @@ -416,8 +414,10 @@ _SATPool->verbose = true; // Solve ! + MIL << "Starting solving...." << endl; solver_solve( solv, &(jobQueue) ); - + MIL << "....Solver end" << endl; + // copying solution back to zypp pool //----------------------------------------- Id p; Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resolver.cc?rev=7963&r1=7962&r2=7963&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Wed Nov 28 17:36:28 2007 @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * 02111-1307, USA. */ +#include #include "zypp/solver/detail/Resolver.h" #include "zypp/solver/detail/Helper.h" @@ -26,7 +27,6 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" #include "zypp/base/Gettext.h" - #include "zypp/base/Algorithm.h" #include "zypp/ResPool.h" #include "zypp/ResFilters.h" @@ -36,9 +36,9 @@ #include "zypp/solver/detail/ResolverInfoNeededBy.h" #include "zypp/capability/FilesystemCap.h" #include "zypp/sat/Pool.h" +#include "zypp/sat/Solvable.h" #include "zypp/sat/SATResolver.h" - ///////////////////////////////////////////////////////////////////////// namespace zypp { /////////////////////////////////////////////////////////////////////// @@ -1289,6 +1289,12 @@ // syncing with sat pool sat::Pool satPool( sat::Pool::instance() ); _pool.satSync(); + MIL << "------SAT-Pool------" << endl; + for (sat::Pool::SolvableIterator i = satPool.solvablesBegin(); + i != satPool.solvablesEnd(); i++ ) { + MIL << *i << " ID: " << i->id() << endl; + } + MIL << "------SAT-Pool end------" << endl; SATResolver satResolver(_pool, satPool.get()); return satResolver.resolvePool(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org