From 5afe67eb6009ea8730bf7b0e0459c9dab80480ff Mon Sep 17 00:00:00 2001 From: Klaus Kaempf Date: Sat, 18 Mar 2006 01:12:57 +0000 Subject: [PATCH] ByCaIUninstalled semantics corrected, it was "staysUninstalled()" move the check for "not transact" here --- zypp/solver/detail/ResolverUpgrade.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zypp/solver/detail/ResolverUpgrade.cc b/zypp/solver/detail/ResolverUpgrade.cc index c77b4c5..0f1f200 100644 --- a/zypp/solver/detail/ResolverUpgrade.cc +++ b/zypp/solver/detail/ResolverUpgrade.cc @@ -477,8 +477,9 @@ MIL << "split matched !" << endl; invokeOnEach( _pool.byCapabilityIndexBegin( installed->name(), dep ), _pool.byCapabilityIndexEnd( installed->name(), dep ), - functor::chain( resfilter::ByCaIUninstalled (), - resfilter::ByCapMatch( installedCap ) ), + functor::chain( resfilter::ByCaINotTransact(), + functor::chain( resfilter::ByCaIUninstalled(), + resfilter::ByCapMatch( installedCap ) ) ), functor::functorRef(info) ); int num_providers = info.providers.size(); -- 2.7.4