Author: schubi2 Date: Mon Sep 1 12:31:30 2008 New Revision: 10902 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10902&view=rev Log: replace SOLVER_ERASE_SOLVABLE_NAME by SOLVER_ERASE_SOLVABLE Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATResolver.cc?rev=10902&r1=10901&r2=10902&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Mon Sep 1 12:31:30 2008 @@ -441,9 +441,6 @@ sat::Pool::instance().prepare(); - // Add ignoring request - - // Solve ! MIL << "Starting solving...." << endl; MIL << *this; @@ -651,10 +648,14 @@ } for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { - sat::detail::IdType ident( (*iter)->satSolvable().ident().id() ); - MIL << "Delete " << *iter << endl; - queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); - queue_push( &(_jobQueue), ident); + Id id = (*iter)->satSolvable().id(); + if (id == ID_NULL) { + ERR << "Delete: " << *iter << " not found" << endl; + } else { + MIL << "Delete " << *iter << endl; + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE ); + queue_push( &(_jobQueue), id); + } } for (CapabilitySet::const_iterator iter = requires_caps.begin(); iter != requires_caps.end(); iter++) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org