From d4d33b2b5ec48aa302a540f0f59c467f26ca10e6 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 30 Jul 2007 12:13:05 +0000 Subject: [PATCH] Not using pool for retrieving additional dependencies which has to be regarded by the solver. --- zypp/solver/detail/Resolver.cc | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc index 1536c42..a848c22 100644 --- a/zypp/solver/detail/Resolver.cc +++ b/zypp/solver/detail/Resolver.cc @@ -882,20 +882,9 @@ Resolver::resolveDependencies (const ResolverContext_Ptr context) ResolverQueue_Ptr initial_queue = new ResolverQueue(_pool, _architecture, context); - // adding "external" provides, the the requirements will be ignored - IgnoreMap ignoreRequires = _ignoreRequires; - ResPool::AdditionalCapSet additionalCapSet = pool().additionaProvide(); - for (ResPool::AdditionalCapSet::const_iterator it = additionalCapSet.begin(); - it != additionalCapSet.end(); it++) { - CapSet cset = it->second; - for (CapSet::const_iterator cit = cset.begin(); cit != cset.end(); ++cit) { - ignoreRequires.insert(make_pair(PoolItem_Ref(), *cit)); - } - } - // Initialize all ignoring dependencies initial_queue->context()->setIgnoreCababilities (_ignoreConflicts, - ignoreRequires, + _ignoreRequires, _ignoreObsoletes, _ignoreInstalledItem, _ignoreArchitectureItem); @@ -955,30 +944,10 @@ Resolver::resolveDependencies (const ResolverContext_Ptr context) initial_queue->addExtraCapability (*iter); } - // adding "external" requires - additionalCapSet = pool().additionalRequire(); - for (ResPool::AdditionalCapSet::const_iterator it = additionalCapSet.begin(); - it != additionalCapSet.end(); it++) { - CapSet cset = it->second; - for (CapSet::const_iterator cit = cset.begin(); cit != cset.end(); ++cit) { - initial_queue->addExtraCapability (*cit); - } - } - for (CapSet::const_iterator iter = _extra_conflicts.begin(); iter != _extra_conflicts.end(); iter++) { initial_queue->addExtraConflict (*iter); } - // adding "external" conflicts - additionalCapSet = pool().additionaConflict(); - for (ResPool::AdditionalCapSet::const_iterator it = additionalCapSet.begin(); - it != additionalCapSet.end(); it++) { - CapSet cset = it->second; - for (CapSet::const_iterator cit = cset.begin(); cit != cset.end(); ++cit) { - initial_queue->addExtraConflict (*cit); - } - } - // Adding System resolvable assertSystemResObjectInPool(); @@ -1223,7 +1192,6 @@ Resolver::resolvePool( bool tryAllPossibilities, bool keepExtras ) // cleanup before next run reset( false, keepExtras ); - bool saveTryAllPossibilities = _tryAllPossibilities; if (tryAllPossibilities) { -- 2.7.4