reduced logging

diff --git a/zypp/solver/detail/ContextPool.cc b/zypp/solver/detail/ContextPool.cc
index fedea08..e457047 100644 (file)
--- a/zypp/solver/detail/ContextPool.cc
+++ b/zypp/solver/detail/ContextPool.cc
@@ -44,7 +44,7 @@ void  dumpTaskList(const PoolItemList &list )
 {
     for (PoolItemList::const_iterator iter = list.begin();
         iter != list.end(); iter++) {
-       DBG << "          " << *iter << endl;
+       XXX << "          " << *iter << endl;
     }
 }
 

diff --git a/zypp/solver/detail/Helper.cc b/zypp/solver/detail/Helper.cc
index 09a9d9a..1157515 100644 (file)
--- a/zypp/solver/detail/Helper.cc
+++ b/zypp/solver/detail/Helper.cc
@@ -125,12 +125,10 @@ class LookForUpdate : public resfilter::PoolItemFilterFunctor
 
     bool operator()( PoolItem_Ref provider )
     {
-        MIL << "comparing: " << endl << provider << endl << uninstalled << endl;
-        
         // is valid
         if ( ! provider.resolvable() )
         {
-          MIL << "Warning: '" << provider << "' not valid" << endl;
+          WAR << "Warning: '" << provider << "' not valid" << endl;
           return true;
         }
 

diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index 79439d7..840f4ab 100644 (file)
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -295,11 +295,11 @@ void  Resolver::dumpTaskList(const PoolItemList &install, const PoolItemList &re
 {
     for (PoolItemList::const_iterator iter = install.begin();
          iter != install.end(); iter++) {
-        DBG << "    to_install " << *iter << endl;
+        XXX << "    to_install " << *iter << endl;
     }
     for (PoolItemList::const_iterator iter = remove.begin();
          iter != remove.end(); iter++) {
-        DBG << "    to_remove " << *iter << endl;
+        XXX << "    to_remove " << *iter << endl;
     }
 }
 

diff --git a/zypp/solver/detail/ResolverContext.cc b/zypp/solver/detail/ResolverContext.cc
index a15908c..3071552 100644 (file)
--- a/zypp/solver/detail/ResolverContext.cc
+++ b/zypp/solver/detail/ResolverContext.cc
@@ -1242,7 +1242,7 @@ ResolverContext::addError (ResolverInfo_Ptr info, bool askUser)
     if (info->type() == RESOLVER_INFO_TYPE_UNINSTALL_LOCKED) {
        for (PoolItemList::const_iterator iter = _ignoreInstalledItem.begin(); iter != _ignoreInstalledItem.end(); iter++) {
            if (info->affected() == *iter) {
-               DBG << "ignore keep installed: " << info->affected() << endl;
+               XXX << "ignore keep installed: " << info->affected() << endl;
                is_error = false;
                break;
            }
@@ -1656,7 +1656,7 @@ struct RequirementPossible
                ResStatus statusInstalled = context->getStatus (installedItem);
                if (installedItem.status().isToBeUninstalled()
                    && installedItem.status().isByUser()){
-                   DBG << provider << " would satify the requirement but it has been selected for removing by the user." << endl;
+                   XXX << provider << " would satify the requirement but it has been selected for removing by the user." << endl;
                    flag = false;
                }
            }
@@ -1742,7 +1742,7 @@ ResolverContext::isParallelInstall (PoolItem_Ref item) const
     for (PoolItemList::const_iterator iter = _ignoreInstalledItem.begin();
         iter != _ignoreInstalledItem.end(); iter++) {
        if (item == *iter) {
-           DBG << "ignore parallel install: " << item << endl;
+           XXX << "ignore parallel install: " << item << endl;
            return false;
        }
     }
@@ -1753,7 +1753,7 @@ ResolverContext::isParallelInstall (PoolItem_Ref item) const
     info.flag = false;
     foreachMarked (dup_name_check_cb, (void *)&info);
     if (info.flag) {
-       DBG << "isParallelInstall!!(" << item << ", " << info.foundItem << ")" << endl;
+       XXX << "isParallelInstall!!(" << item << ", " << info.foundItem << ")" << endl;
     }
     return info.flag;
 }
@@ -1966,24 +1966,24 @@ ResolverContext::partialCompare (ResolverContext_Ptr context)
        if (_preferHighestVersion) {
            // comparing versions
            cmp = cmpVersion;
-           DBG << "Comparing versions returned :" << cmp << endl;
+           XXX << "Comparing versions returned :" << cmp << endl;
            if (cmp == 0) { 
                // High numbers are good... we don't want solutions containing low-priority channels.
                // Repo priority which has been set externally
                cmp = num_cmp (_min_priority, context->_min_priority);
-               DBG << "Comparing priority returned :" << cmp << endl;
+               XXX << "Comparing priority returned :" << cmp << endl;
                if (cmp == 0) {
                    // High numbers are bad.  Less churn is better.
                    cmp = rev_num_cmp (churn_factor (this), churn_factor (context));
-                   DBG << "Comparing churn_factor returned :" << cmp << endl;
+                   XXX << "Comparing churn_factor returned :" << cmp << endl;
                    if (cmp == 0) {             
                        // Comparing repositorys regarding the items which has to be installed
                        cmp = cmpRepo;
-                       DBG << "Comparing repositorys returned :" << cmp << endl;               
+                       XXX << "Comparing repositorys returned :" << cmp << endl;               
                        if (cmp == 0) {
                            // High numbers are bad.  Bigger #s means more penalties.
                            cmp = rev_num_cmp (_other_penalties, context->_other_penalties);
-                           DBG << "Comparing other penalties returned :" << cmp << endl;                       
+                           XXX << "Comparing other penalties returned :" << cmp << endl;                       
                        }
                    }
                }
@@ -1992,23 +1992,23 @@ ResolverContext::partialCompare (ResolverContext_Ptr context)
            // less transaction will be prefered
            // High numbers are bad.  Less churn is better.
            cmp = rev_num_cmp (churn_factor (this), churn_factor (context));
-           DBG << "Comparing churn_factor returned :" << cmp << endl;      
+           XXX << "Comparing churn_factor returned :" << cmp << endl;      
            if (cmp == 0) { 
                // High numbers are good... we don't want solutions containing low-priority channels.
                // Repo priority which has been set externally
                cmp = num_cmp (_min_priority, context->_min_priority);
-               DBG << "Comparing priority returned :" << cmp << endl;
+               XXX << "Comparing priority returned :" << cmp << endl;
                if (cmp == 0) {
                    cmp = cmpVersion;
-                   DBG << "Comparing versions returned :" << cmp << endl;
+                   XXX << "Comparing versions returned :" << cmp << endl;
                    if (cmp == 0) {             
                        // Comparing repositorys regarding the items which has to be installed
                        cmp = cmpRepo;
-                       DBG << "Comparing repositorys returned :" << cmp << endl;               
+                       XXX << "Comparing repositorys returned :" << cmp << endl;               
                        if (cmp == 0) {
                            // High numbers are bad.  Bigger #s means more penalties.
                            cmp = rev_num_cmp (_other_penalties, context->_other_penalties);
-                           DBG << "Comparing other penalties returned :" << cmp << endl;                       
+                           XXX << "Comparing other penalties returned :" << cmp << endl;                       
                        }
                    }
                }

diff --git a/zypp/solver/detail/Resolver_problems.cc b/zypp/solver/detail/Resolver_problems.cc
index fcc2df3..0dd5579 100644 (file)
--- a/zypp/solver/detail/Resolver_problems.cc
+++ b/zypp/solver/detail/Resolver_problems.cc
@@ -398,8 +398,8 @@ Resolver::problems (const bool ignoreValidSolution) const
 
        bool problem_created = false;
 
-       DBG << "Problem: " << *info;
-       DBG << "; Evaluate solutions..." << endl;
+       MIL << "Problem: " << *info;
+       XXX << "; Evaluate solutions..." << endl;
        string what;
        string details;