Author: schubi2 Date: Fri Nov 30 13:52:43 2007 New Revision: 7990 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7990&view=rev Log: bugfix for taking solutions Modified: trunk/libzypp/zypp/sat/SATResolver.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?rev=7990&r1=7989&r2=7990&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Fri Nov 30 13:52:43 2007 @@ -363,7 +363,16 @@ MIL << "SATResolver::resolvePool()" << endl; - queue_init( &jobQueue ); + if (solv) { + // remove old stuff + solver_free(solv); + solv = NULL; + queue_free( &(jobQueue) ); + } + + queue_init( &jobQueue ); + _items_to_install.clear(); + _items_to_remove.clear(); invokeOnEach ( _pool.begin(), _pool.end(), resfilter::ByTransact( ), // collect transacts from Pool to resolver queue @@ -392,7 +401,7 @@ for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { 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), SOLVER_ERASE_SOLVABLE ); queue_push( &(jobQueue), id); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org