Author: schubi2 Date: Thu Jul 17 09:48:45 2008 New Revision: 10600 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10600&view=rev Log: using SOLVER_NOOBSOLETES_SOLVABLE_NAME instead of SOLVER_NOOBSOLETES_SOLVABLE Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc trunk/libzypp/zypp/solver/detail/SATResolver.h Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRes... ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Thu Jul 17 09:48:45 2008 @@ -251,13 +251,6 @@ } void -SATResolver::addPoolItemParallelInstall(PoolItem item) -{ - _items_parallel_install.push_back (item); - _items_parallel_install.unique (); -} - -void SATResolver::addPoolItemToKeep (PoolItem item) { resetItemTransaction (item); @@ -354,10 +347,6 @@ bool operator()( PoolItem item ) // only transacts() items go here { - if (item->installOnly()) { - resolver. addPoolItemParallelInstall(item); - } - ResStatus status = item.status(); bool by_solver = (status.isBySolver() || status.isByApplLow()); @@ -608,7 +597,6 @@ _items_to_remove.clear(); _items_to_lock.clear(); _items_to_keep.clear(); - _items_parallel_install.clear(); invokeOnEach ( _pool.begin(), _pool.end(), functor::functorRef<bool,PoolItem>(info) ); @@ -623,15 +611,11 @@ queue_push( &(_jobQueue), id ); } - for (PoolItemList::iterator it = _items_parallel_install.begin(); it != _items_parallel_install.end(); ++it) { - Id id = (*it)->satSolvable().id(); - if (id == ID_NULL) { - ERR << "Item " << *it << " not found" << endl; - } else { - MIL << "Ignore Obsoletes of item: " << *it << endl; - queue_push( &(_jobQueue), SOLVER_NOOBSOLETES_SOLVABLE ); - queue_push( &(_jobQueue), id ); - } + // Add rules for parallel installable resolvables + std::set<IdString> parallel = ZConfig::instance().parallelInstallable(); + for (std::set<IdString>::const_iterator it = parallel.begin(); it != parallel.end(); ++it) { + queue_push( &(_jobQueue), SOLVER_NOOBSOLETES_SOLVABLE_NAME ); + queue_push( &(_jobQueue), it->id() ); } } Modified: trunk/libzypp/zypp/solver/detail/SATResolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRes... ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.h (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.h Thu Jul 17 09:48:45 2008 @@ -70,7 +70,6 @@ PoolItemList _items_to_remove; PoolItemList _items_to_lock; PoolItemList _items_to_keep; - PoolItemList _items_parallel_install; // solve results PoolItemList _result_items_to_install; @@ -138,8 +137,6 @@ void addPoolItemToLock (PoolItem item); void addPoolItemToKeep (PoolItem item); - void addPoolItemParallelInstall (PoolItem item); - void addPoolItemToRemove (PoolItem item); void addPoolItemsToRemoveFromList (PoolItemList & rl); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org