Author: mlandres Date: Wed Jun 27 13:57:22 2007 New Revision: 5847 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5847&view=rev Log: InstallOrder: log only 1st occurrence of a dependency loop Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.cc branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.h Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.cc?rev=5847&r1=5846&r2=5847&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.cc Wed Jun 27 13:57:22 2007 @@ -296,7 +296,14 @@ { if (must_visit != item) { - WAR << "** dependency loop: " << ITEMNAME(item) << " -> " << ITEMNAME(must_visit) << endl; + // log only the 1st occurrence. + std::string lstr( ITEMNAME(item) ); + lstr += " -> "; + lstr += ITEMNAME(must_visit); + if ( _logset.insert( lstr ).second ) + { + WAR << "** dependency loop: " << lstr << endl; + } } } else Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.h?rev=5847&r1=5846&r2=5847&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/InstallOrder.h Wed Jun 27 13:57:22 2007 @@ -30,8 +30,10 @@ #ifndef ZYPP_SOLVER_DETAIL_INSTALLORDER_H #define ZYPP_SOLVER_DETAIL_INSTALLORDER_H +#include <string> #include <list> #include <map> +#include <set> #include "zypp/PoolItem.h" #include "zypp/ResPool.h" @@ -98,6 +100,8 @@ unsigned _numrun; + std::setstd::string _logset; + private: void rdfsvisit (PoolItem_Ref item); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org