further reduce debug

diff --git a/zypp/solver/detail/QueueItemBranch.cc b/zypp/solver/detail/QueueItemBranch.cc
index 2b6bafa..498da38 100644 (file)
--- a/zypp/solver/detail/QueueItemBranch.cc
+++ b/zypp/solver/detail/QueueItemBranch.cc
@@ -131,7 +131,7 @@ QueueItemBranch::contains (QueueItem_Ptr possible_subbranch)
 bool
 QueueItemBranch::process (ResolverContext_Ptr context, QueueItemList & qil)
 {
-    _DEBUG("QueueItemBranch::process(" << *this << ")");
+    _XDEBUG("QueueItemBranch::process(" << *this << ")");
 
     QueueItemList live_branches;
     unsigned int branch_count;

diff --git a/zypp/solver/detail/QueueItemConflict.cc b/zypp/solver/detail/QueueItemConflict.cc
index b5e0c45..550dca0 100644 (file)
--- a/zypp/solver/detail/QueueItemConflict.cc
+++ b/zypp/solver/detail/QueueItemConflict.cc
@@ -311,7 +311,7 @@ struct ConflictProcess : public resfilter::OnCapMatchCallbackFunctor
 bool
 QueueItemConflict::process (ResolverContext_Ptr context, QueueItemList & new_items)
 {
-    _DEBUG("QueueItemConflict::process(" << *this << ")");
+    _XDEBUG("QueueItemConflict::process(" << *this << ")");
 
     // checking for ignoring dependencies
     IgnoreMap ignoreMap = context->getIgnoreConflicts();    

diff --git a/zypp/solver/detail/QueueItemEstablish.cc b/zypp/solver/detail/QueueItemEstablish.cc
index f85bbdd..f5da4d3 100644 (file)
--- a/zypp/solver/detail/QueueItemEstablish.cc
+++ b/zypp/solver/detail/QueueItemEstablish.cc
@@ -96,7 +96,7 @@ QueueItemEstablish::isSatisfied (ResolverContext_Ptr context) const
 bool
 QueueItemEstablish::process (ResolverContext_Ptr context, QueueItemList & qil)
 {
-    _DEBUG("QueueItemEstablish::process(" << *this << ")");
+    _XDEBUG("QueueItemEstablish::process(" << *this << ")");
 
     CapSet freshens = _item->dep(Dep::FRESHENS);
 

diff --git a/zypp/solver/detail/QueueItemGroup.cc b/zypp/solver/detail/QueueItemGroup.cc
index ec4b8cd..a12d426 100644 (file)
--- a/zypp/solver/detail/QueueItemGroup.cc
+++ b/zypp/solver/detail/QueueItemGroup.cc
@@ -65,7 +65,7 @@ QueueItemGroup::~QueueItemGroup()
 bool
 QueueItemGroup::process (ResolverContext_Ptr context, QueueItemList & new_items)
 {
-    DBG << "QueueItemGroup::process" << endl;
+    _DEBUG( "QueueItemGroup::process" );
 
     bool did_something = false;
 

diff --git a/zypp/solver/detail/QueueItemInstall.cc b/zypp/solver/detail/QueueItemInstall.cc
index 4c79e6a..35ddcec 100644 (file)
--- a/zypp/solver/detail/QueueItemInstall.cc
+++ b/zypp/solver/detail/QueueItemInstall.cc
@@ -164,7 +164,7 @@ QueueItemInstall::process (ResolverContext_Ptr context, QueueItemList & qil)
 {
     ResStatus status = context->getStatus(_item);
 
-    _DEBUG( "QueueItemInstall::process(" << *this << "):" << status);
+    _XDEBUG( "QueueItemInstall::process(" << *this << "):" << status);
 
     /* If we are trying to upgrade item A with item B and they both have the
        same version number, do nothing.  This shouldn't happen in general with

diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index e9941c8..f3f79ae 100644 (file)
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -291,7 +291,7 @@ struct VerifySystem : public resfilter::PoolItemFilterFunctor
 bool
 Resolver::verifySystem (void)
 {
-    DBG <<  "Resolver::verifySystem()" << endl;
+    _DEBUG( "Resolver::verifySystem()" );
 
     VerifySystem info (*this);
 
@@ -367,7 +367,7 @@ struct EstablishState : public resfilter::OnCapMatchCallbackFunctor
 void
 Resolver::establishState (ResolverContext_Ptr context)
 {
-    DBG << "Resolver::establishState ()" << endl;
+    _DEBUG( "Resolver::establishState ()" );
     typedef list<Resolvable::Kind> KindList; 
     static KindList ordered;
     if (ordered.empty()) {
@@ -538,7 +538,7 @@ Resolver::resolveDependencies (const ResolverContext_Ptr context)
        initial_queue->addExtraConflict (*iter);
     }
 
-    DBG << "Initial Queue: [" << *initial_queue << "]" << endl;
+    _DEBUG( "Initial Queue: [" << *initial_queue << "]" );
 
     if (initial_queue->isEmpty()) {
        INT << "Empty Queue, nothing to resolve" << endl;
@@ -554,11 +554,11 @@ Resolver::resolveDependencies (const ResolverContext_Ptr context)
 
     while (!_pending_queues.empty()) {
 
-       DBG << "Pend " << (long) _pending_queues.size()
+       _DEBUG( "Pend " << (long) _pending_queues.size()
                              << " / Cmpl " << (long) _complete_queues.size()
                              << " / Prun " << (long) _pruned_queues.size()
                              << " / Defr " << (long) _deferred_queues.size()
-                             << " / Invl " << (long) _invalid_queues.size() << endl;
+                             << " / Invl " << (long) _invalid_queues.size() );
 
              if (_timeout_seconds > 0) {
                    time (&t_now);
@@ -624,11 +624,11 @@ Resolver::resolveDependencies (const ResolverContext_Ptr context)
            _pending_queues.push_back(_deferred_queues.front());
        }
     }
-    DBG << "Pend " << (long) _pending_queues.size()
+    _DEBUG("Pend " << (long) _pending_queues.size()
                   << " / Cmpl " << (long) _complete_queues.size()
                   << " / Prun " << (long) _pruned_queues.size()
                   << " / Defr " << (long) _deferred_queues.size()
-                  << " / Invl " << (long) _invalid_queues.size() << endl;
+                  << " / Invl " << (long) _invalid_queues.size() );
 
     return _best_context && _best_context->isValid();
 }