From 930400d689f6f1d677a06173be0af471311a39f0 Mon Sep 17 00:00:00 2001 From: Klaus Kaempf Date: Thu, 2 Feb 2006 11:24:44 +0000 Subject: [PATCH] more debug --- zypp/solver/detail/QueueItemEstablish.cc | 8 ++++---- zypp/solver/detail/QueueItemRequire.cc | 5 +++-- zypp/solver/detail/ResolverContext.cc | 6 ++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/zypp/solver/detail/QueueItemEstablish.cc b/zypp/solver/detail/QueueItemEstablish.cc index 5cef170..c094718 100644 --- a/zypp/solver/detail/QueueItemEstablish.cc +++ b/zypp/solver/detail/QueueItemEstablish.cc @@ -109,7 +109,7 @@ QueueItemEstablish::process (ResolverContext_Ptr context, QueueItemList & qil) for (iter = freshens.begin(); iter != freshens.end(); iter++) { const Capability cap = *iter; if (context->requirementIsMet (cap)) { - DBG << "this freshens " << cap << endl; + MIL << "this freshens " << cap << endl; break; } } @@ -123,7 +123,7 @@ QueueItemEstablish::process (ResolverContext_Ptr context, QueueItemList & qil) && freshens.size() > 0 && iter == freshens.end()) { - DBG << "this freshens nothing -> unneeded" << endl; + MIL << "this freshens nothing -> unneeded" << endl; context->unneeded (_item, _other_penalty); } else { // installed or no freshens or triggered freshens @@ -136,11 +136,11 @@ QueueItemEstablish::process (ResolverContext_Ptr context, QueueItemList & qil) } } if (iter == requires.end()) { // all are met - DBG << "all requirements met -> satisfied" << endl; + MIL << "all requirements met -> satisfied" << endl; context->satisfy (_item, _other_penalty); } else { - DBG << "unfulfilled requirements -> incomplete" << endl; + MIL << "unfulfilled requirements -> incomplete" << endl; context->incomplete (_item, _other_penalty); } } diff --git a/zypp/solver/detail/QueueItemRequire.cc b/zypp/solver/detail/QueueItemRequire.cc index 4e268a7..54fe387 100644 --- a/zypp/solver/detail/QueueItemRequire.cc +++ b/zypp/solver/detail/QueueItemRequire.cc @@ -162,7 +162,8 @@ struct RequireProcess : public resfilter::OnCapMatchCallbackFunctor ResStatus status; status = context->getStatus(provider); -// ERR << "RequireProcessInfo (" << *provider << " provides " << match << ", is " << status << ")" << endl; + + MIL << "RequireProcessInfo (" << provider << " provides " << match << ", is " << status << ")" << endl; // ERR << "RequireProcessInfo(required: " << *capability << ")" << endl; // ERR << "require_process_cb(itemIsPossible -> " << context->itemIsPossible (*provider) << ")" << endl; @@ -299,7 +300,7 @@ QueueItemRequire::process (ResolverContext_Ptr context, QueueItemList & new_item if (! _remove_only) { Dep dep( Dep::PROVIDES ); - + MIL << "Look for providers of " << _capability << endl; // world->foreachProvidingResItem (_capability, require_process_cb, &info); invokeOnEach( pool().byCapabilityIndexBegin( _capability.index(), dep ), pool().byCapabilityIndexEnd( _capability.index(), dep ), diff --git a/zypp/solver/detail/ResolverContext.cc b/zypp/solver/detail/ResolverContext.cc index 14bbdbc..24a23c5 100644 --- a/zypp/solver/detail/ResolverContext.cc +++ b/zypp/solver/detail/ResolverContext.cc @@ -1209,12 +1209,10 @@ ResolverContext::requirementIsPossible (const Capability & dependency) const Dep dep( Dep::PROVIDES ); - // world->foreachProvidingResItem (dependency, require_process_cb, &info); - invokeOnEach( pool().byCapabilityIndexBegin( dependency.index(), dep ), pool().byCapabilityIndexEnd( dependency.index(), dep ), resfilter::callOnCapMatchIn( dep, dependency, functor::functorRef(info) ) ); - + MIL << "requirementIsPossible( " << dependency << ") = " << (info.flag ? "Y" : "N") << endl; return info.flag; } @@ -1260,7 +1258,7 @@ ResolverContext::isParallelInstall (PoolItem_Ref item) const info.other = item; info.flag = false; foreachMarked (dup_name_check_cb, (void *)&info); - + MIL << "isParallelInstall(" << item << ") = " << (info.flag ? "Y" : "N") << endl; return info.flag; } -- 2.7.4