ref: refs/heads/SuSE-Code-11-Branch
commit f61190d63ef42884e810c523d6e13cd225b9cf85
Author: Michael Andres
Date: Tue Mar 3 12:47:18 2009 +0100
Adapt to changed satsolver API.
---
zypp/solver/detail/SATResolver.cc | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 848bd87..96e665e 100644
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -554,7 +554,6 @@ SATResolver::solving(const CapabilitySet & requires_caps,
}
/* Write validation state back to pool */
- Map installedmap;
Queue flags, solvableQueue;
queue_init(&flags);
@@ -565,8 +564,7 @@ SATResolver::solving(const CapabilitySet & requires_caps,
_pool.end(),
functor::not_c(resfilter::byKind<Package>()), // every solvable BUT packages
functor::functorRef (collectNonePackages) );
- solver_create_state_maps(_solv, &installedmap, 0);
- pool_trivial_installable(_solv->pool, &installedmap, &solvableQueue, &flags);
+ solver_trivial_installable(_solv, &solvableQueue, &flags );
for (int i = 0; i < solvableQueue.count; i++) {
PoolItem item = _pool.find (sat::Solvable(solvableQueue.elements[i]));
item.status().setUndetermined();
@@ -613,7 +611,6 @@ SATResolver::solving(const CapabilitySet & requires_caps,
return false;
}
- map_free(&installedmap);
queue_free(&(solvableQueue));
queue_free(&flags);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org