Author: schubi2 Date: Mon Feb 18 11:20:13 2008 New Revision: 8775 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8775&view=rev Log: generating testcase only if ZYPP_FULLLOG is set Modified: trunk/libzypp/zypp/sat/SATResolver.cc trunk/libzypp/zypp/solver/detail/Resolver.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?rev=8775&r1=8774&r2=8775&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Mon Feb 18 11:20:13 2008 @@ -34,7 +34,6 @@ #include "zypp/sat/SATResolver.h" #include "zypp/sat/Pool.h" #include "zypp/solver/detail/ProblemSolutionCombi.h" -#include "zypp/solver/detail/Testcase.h" extern "C" { #include "satsolver/repo_solv.h" @@ -360,6 +359,7 @@ const CapabilitySet & conflict_caps) { SATCollectTransact info (*this); + MIL << "SATResolver::resolvePool()" << endl; if (_solv) { @@ -482,10 +482,10 @@ } } - // clean up + // cleanup solver_free(_solv); _solv = NULL; - queue_free( &(_jobQueue) ); + queue_free( &(_jobQueue) ); MIL << "SATResolver::resolvePool() done" << endl; return true; Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resolver.cc?rev=8775&r1=8774&r2=8775&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Mon Feb 18 11:20:13 2008 @@ -72,10 +72,8 @@ , _verifying(false) { - Testcase testcase("/var/log/YaST2/autoTestcase"); sat::Pool satPool( sat::Pool::instance() ); _satResolver = new SATResolver(_pool, satPool.get()); - testcase.createTestcase (*this, true, false); // create pool, do not solver } @@ -250,10 +248,17 @@ { // Solving with the satsolver + static bool poolDumped = false; MIL << "-------------- Calling SAT Solver -------------------" << endl; - Testcase testcase("/var/log/YaST2/autoTestcase"); - testcase.createTestcase (*this, false, false); // write control file only - + if ( getenv("ZYPP_FULLLOG") ) { + Testcase testcase("/var/log/YaST2/autoTestcase"); + if (!poolDumped) { + testcase.createTestcase (*this, true, false); // dump pool + poolDumped = true; + } else { + testcase.createTestcase (*this, false, false); // write control file only + } + } #if 0 MIL << "------SAT-Pool------" << endl; for (sat::Pool::SolvableIterator i = satPool.solvablesBegin(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org