November 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7981 - in /trunk/libzypp/zypp: sat/SATResolver.cc solver/detail/Resolver.cc solver/detail/Resolver.h solver/detail/Resolver_problems.cc
by schubi2＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: schubi2 Date: Thu Nov 29 18:33:37 2007 New Revision: 7981 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7981&view=rev Log: errormessage enabled for SAT solver Modified: trunk/libzypp/zypp/sat/SATResolver.cc trunk/libzypp/zypp/solver/detail/Resolver.cc trunk/libzypp/zypp/solver/detail/Resolver.h trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Thu Nov 29 18:33:37 2007 @@ -411,6 +411,11 @@ // copying solution back to zypp pool //----------------------------------------- + if (solv->problems.count > 0 ) + { + ERR << "Solverrun finished with an ERROR" << endl; + return false; + } /* solvables to be erased */ for (int i = solv->installed->start; i < solv->installed->start + solv->installed->nsolvables; i++) { Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Thu Nov 29 18:33:37 2007 @@ -110,6 +110,7 @@ Resolver::Resolver (const ResPool & pool) : _pool (pool) + , _satResolver (NULL) , _poolchanged( _pool.serial() ) , _timeout_seconds (0) , _maxSolverPasses (0) @@ -1284,11 +1285,14 @@ { // Solving with the satsolver - if ( getenv("ZYPP_SAT_SOLVER") ) { - MIL << "-------------- Calling SAT Solver -------------------" << endl; - // syncing with sat pool - sat::Pool satPool( sat::Pool::instance() ); - _pool.satSync(); + if ( getenv("ZYPP_SAT_SOLVER")) { + MIL << "-------------- Calling SAT Solver -------------------" << endl; + if ( !_satResolver ) { + // syncing with sat pool + sat::Pool satPool( sat::Pool::instance() ); + _pool.satSync(); + _satResolver = new SATResolver(_pool, satPool.get()); + } #if 0 MIL << "------SAT-Pool------" << endl; for (sat::Pool::SolvableIterator i = satPool.solvablesBegin(); @@ -1297,9 +1301,7 @@ } MIL << "------SAT-Pool end------" << endl; #endif - - SATResolver satResolver(_pool, satPool.get()); - return satResolver.resolvePool(); + return _satResolver->resolvePool(); } ResolverContext_Ptr saveContext = _best_context; Modified: trunk/libzypp/zypp/solver/detail/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.h (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.h Thu Nov 29 18:33:37 2007 @@ -42,7 +42,6 @@ #include "zypp/ResolverProblem.h" #include "zypp/ProblemSolution.h" #include "zypp/UpgradeStatistics.h" - #include "zypp/CapSet.h" @@ -56,6 +55,10 @@ namespace detail { /////////////////////////////////////////////////////////////////// + class SATResolver; + + + /////////////////////////////////////////////////////////////////// // // CLASS NAME : ItemCapKind @@ -89,6 +92,7 @@ private: ResPool _pool; + SATResolver *_satResolver; SerialNumberWatcher _poolchanged; unsigned _timeout_seconds; Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver_problems.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Thu Nov 29 18:33:37 2007 @@ -42,6 +42,7 @@ #include "zypp/solver/detail/ResolverInfoMissingReq.h" #include "zypp/solver/detail/ResolverInfoNeededBy.h" #include "zypp/solver/detail/ResolverInfoObsoletes.h" +#include "zypp/sat/SATResolver.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -345,6 +346,9 @@ ResolverProblemList Resolver::problems (const bool ignoreValidSolution) const { + if ( getenv("ZYPP_SAT_SOLVER") && _satResolver ) + return _satResolver->problems(); + ResolverProblemList problems; MIL << "Resolver::problems(" << (ignoreValidSolution ? "ignoreValidSolution": "") << ")" << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7980 - /trunk/sat-solver/src/solver.c
by schubi2＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: schubi2 Date: Thu Nov 29 18:32:59 2007 New Revision: 7980 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7980&view=rev Log: do not regard recommends of installed items Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7980… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Nov 29 18:32:59 2007 @@ -24,6 +24,7 @@ #include "policy.h" #define RULES_BLOCK 63 +#define REGARD_RECOMMENDS_OF_INSTALLED_ITEMS 0 int @@ -2201,7 +2202,7 @@ int qcount; POOL_DEBUG(SAT_DEBUG_STATS, "installing recommended packages\n"); - if (0) + if (!REGARD_RECOMMENDS_OF_INSTALLED_ITEMS) { for (i = 0; i < solv->decisionq.count; i++) { @@ -2253,7 +2254,7 @@ queue_pushunique(&dq, i); } } - if (0) + if (!REGARD_RECOMMENDS_OF_INSTALLED_ITEMS) { for (i = 0; i < solv->decisionq.count; i++) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7979 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: mlschroe Date: Thu Nov 29 16:03:21 2007 New Revision: 7979 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7979&view=rev Log: - prefer assertions to make coolo happy Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7979… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Nov 29 16:03:21 2007 @@ -2941,6 +2941,7 @@ Id rid; Id lreqr, lconr, lsysr, ljobr; Rule *r; + int reqassert = 0; lreqr = lconr = lsysr = ljobr = 0; while ((rid = solv->learnt_pool.elements[idx++]) != 0) @@ -2974,11 +2975,14 @@ else { /* assertion, counts as require rule */ - /* system solvable doesn't count, as this is useful information */ + /* ignore system solvable as we need useful info */ if (rid == -SYSTEMSOLVABLE) continue; - if (!*reqrp) - *reqrp = rid; + if (!*reqrp || !reqassert) + { + *reqrp = rid; + reqassert = 1; + } } } if (!*reqrp && lreqr) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7978 - in /trunk/libzypp/zypp: sat/SATResolver.cc solver/detail/Resolver.cc
by schubi2＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: schubi2 Date: Thu Nov 29 14:22:20 2007 New Revision: 7978 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7978&view=rev Log: bugfixes 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?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Thu Nov 29 14:22:20 2007 @@ -31,7 +31,7 @@ #include "zypp/ResFilters.h" #include "zypp/CapFilters.h" #include "zypp/sat/SATResolver.h" -#include "zypp/sat/Solvable.h" +#include "zypp/sat/Pool.h" #include "zypp/solver/detail/ProblemSolutionCombi.h" extern "C" { @@ -187,10 +187,12 @@ static void SATSolutionToPool (PoolItem_Ref item, const ResStatus & status, const ResStatus::TransactByValue causer) { +#if 0 if (triggeredSolution.find(item) != triggeredSolution.end()) { _XDEBUG("SATSolutionToPool(" << item << ") is already in the pool --> skip"); return; } +#endif triggeredSolution.insert(item); @@ -394,18 +396,7 @@ queue_push( &(jobQueue), id); } - // Searching concerning system repo - Repo *systemRepo = NULL; - for (int i = 0; i < _SATPool->nrepos; i++) - { - string compName(repo_name(_SATPool->repos[i])); - if (compName == "system") { - systemRepo = _SATPool->repos[i]; - break; - } - } - - solv = solver_create( _SATPool, systemRepo ); + solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get() ); solv->fixsystem = false; solv->updatesystem = false; solv->allowdowngrade = false; @@ -419,7 +410,6 @@ // copying solution back to zypp pool //----------------------------------------- - Id p; /* solvables to be erased */ for (int i = solv->installed->start; i < solv->installed->start + solv->installed->nsolvables; i++) @@ -429,9 +419,7 @@ PoolItem_Ref poolItem = _pool.find (sat::Solvable(i)); if (poolItem) { - ResStatus status; - status.isToBeUninstalled(); - SATSolutionToPool (poolItem, status, ResStatus::SOLVER); + SATSolutionToPool (poolItem, ResStatus::toBeUninstalled, ResStatus::SOLVER); } else { ERR << "id " << i << " not found in ZYPP pool." << endl; } @@ -440,19 +428,18 @@ /* solvables to be installed */ for (int i = 0; i < solv->decisionq.count; i++) { + Id p; p = solv->decisionq.elements[i]; - if (p < 0) + if (p < 0 || !sat::Solvable(p)) continue; - if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables) + if (sat::Solvable(p).repo().get() == solv->installed) continue; PoolItem_Ref poolItem = _pool.find (sat::Solvable(p)); if (poolItem) { - ResStatus status; - status.isToBeInstalled(); - SATSolutionToPool (poolItem, status, ResStatus::SOLVER); + SATSolutionToPool (poolItem, ResStatus::toBeInstalled, ResStatus::SOLVER); } else { - ERR << "id " << p << " not found in ZYPP pool." << endl; + ERR << "id " << p << " not found in ZYPP pool." << endl; } } Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Thu Nov 29 14:22:20 2007 @@ -1289,12 +1289,14 @@ // syncing with sat pool sat::Pool satPool( sat::Pool::instance() ); _pool.satSync(); +#if 0 MIL << "------SAT-Pool------" << endl; for (sat::Pool::SolvableIterator i = satPool.solvablesBegin(); i != satPool.solvablesEnd(); i++ ) { MIL << *i << " ID: " << i->id() << endl; } - MIL << "------SAT-Pool end------" << endl; + MIL << "------SAT-Pool end------" << endl; +#endif SATResolver satResolver(_pool, satPool.get()); return satResolver.resolvePool(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7977 - /trunk/libzypp/zypp/pool/PoolImpl.cc
by mlandres＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: mlandres Date: Thu Nov 29 13:10:31 2007 New Revision: 7977 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7977&view=rev Log: fis pool syncing Modified: trunk/libzypp/zypp/pool/PoolImpl.cc Modified: trunk/libzypp/zypp/pool/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/pool/PoolImpl.cc?re… ============================================================================== --- trunk/libzypp/zypp/pool/PoolImpl.cc (original) +++ trunk/libzypp/zypp/pool/PoolImpl.cc Thu Nov 29 13:10:31 2007 @@ -244,11 +244,15 @@ // collect unsynced PoolItems per repository. std::map<std::string, std::list<PoolItem> > todo; + const std::string & systemRepoName( sat::Pool::instance().systemRepoName() ); for_( it, begin(), end() ) { if ( ! (*it).satSolvable() ) { - todo[(*it)->repository().info().alias()].push_back( *it ); + if ( (*it).status().isInstalled() ) + todo[systemRepoName].push_back( *it ); + else + todo[(*it)->repository().info().alias()].push_back( *it ); } } @@ -259,7 +263,7 @@ for_( it, todo.begin(), todo.end() ) { DBG << "Update repo " << it->first << ": " << it->second.size() << endl; - sat::Repo repo( sat::Pool::instance().reposInsert( it->first ) ); + sat::Repo repo( sat::Pool::instance().reposInsert( it->first.empty() ? "@Builtin" : it->first ) ); sat::Solvable first( repo.addSolvables( it->second.size() ) ); DBG << " starting at " << first << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7976 - in /trunk/libzypp/zypp/sat: Pool.cc Pool.h Repo.cc Repo.h Solvable.cc Solvable.h
by mlandres＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: mlandres Date: Thu Nov 29 13:10:09 2007 New Revision: 7976 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7976&view=rev Log: add @system repo Modified: trunk/libzypp/zypp/sat/Pool.cc trunk/libzypp/zypp/sat/Pool.h trunk/libzypp/zypp/sat/Repo.cc trunk/libzypp/zypp/sat/Repo.h trunk/libzypp/zypp/sat/Solvable.cc trunk/libzypp/zypp/sat/Solvable.h Modified: trunk/libzypp/zypp/sat/Pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Pool.cc?rev=797… ============================================================================== --- trunk/libzypp/zypp/sat/Pool.cc (original) +++ trunk/libzypp/zypp/sat/Pool.cc Thu Nov 29 13:10:09 2007 @@ -37,6 +37,12 @@ namespace sat { ///////////////////////////////////////////////////////////////// + const std::string & Pool::systemRepoName() + { + static const std::string _val( "@System" ); + return _val; + } + ::_Pool * Pool::get() const { return myPool().getPool(); } @@ -112,11 +118,6 @@ return Repo(); } - void Pool::reposErase( const std::string & name_r ) - { - reposFind( name_r ).eraseFromPool(); - } - Repo Pool::addRepoSolv( const Pathname & file_r, const std::string & name_r ) { // Using a temporay repo! (The additional parenthesis are required.) @@ -129,11 +130,6 @@ return tmprepo; } - Repo Pool::addRepoSolv( const Pathname & file_r ) - { - return addRepoSolv( file_r, file_r.basename() ); - } - /****************************************************************** ** ** FUNCTION NAME : operator<< Modified: trunk/libzypp/zypp/sat/Pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Pool.h?rev=7976… ============================================================================== --- trunk/libzypp/zypp/sat/Pool.h (original) +++ trunk/libzypp/zypp/sat/Pool.h Thu Nov 29 13:10:09 2007 @@ -15,6 +15,7 @@ #include <iosfwd> #include "zypp/sat/detail/PoolMember.h" +#include "zypp/sat/Repo.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -87,7 +88,16 @@ /** Remove a \ref Repo named \c name_r. * \see \ref Repo::eraseFromPool */ - void reposErase( const std::string & name_r ); + void reposErase( const std::string & name_r ) + { reposFind( name_r ).eraseFromPool(); } + + public: + /** Reserved system repo name \c @System. */ + static const std::string & systemRepoName(); + + /** Return the system repo. */ + Repo systemRepo() + { return reposInsert( systemRepoName() ); } public: /** Load \ref Solvables from a solv-file into a \ref Repo named \c name_r. @@ -97,7 +107,8 @@ */ Repo addRepoSolv( const Pathname & file_r, const std::string & name_r ); /** \overload Using the files basename as \ref Repo name. */ - Repo addRepoSolv( const Pathname & file_r ); + Repo addRepoSolv( const Pathname & file_r ) + { return addRepoSolv( file_r, file_r.basename() ); } public: /** Whether \ref Pool contains solvables. */ Modified: trunk/libzypp/zypp/sat/Repo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Repo.cc?rev=797… ============================================================================== --- trunk/libzypp/zypp/sat/Repo.cc (original) +++ trunk/libzypp/zypp/sat/Repo.cc Thu Nov 29 13:10:09 2007 @@ -20,7 +20,7 @@ #include "zypp/sat/detail/PoolImpl.h" #include "zypp/sat/Repo.h" -#include "zypp/sat/Solvable.h" +#include "zypp/sat/Pool.h" using std::endl; @@ -46,6 +46,12 @@ ::_Repo * _repo( get() ); \ if ( ! _repo ) ZYPP_THROW( VAL ) + bool Repo::isSystemRepo() const + { + NO_REPO_RETURN( false ); + return( Pool::systemRepoName() == _repo->name ); + } + std::string Repo::name() const { NO_REPO_RETURN( std::string() ); Modified: trunk/libzypp/zypp/sat/Repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Repo.h?rev=7976… ============================================================================== --- trunk/libzypp/zypp/sat/Repo.h (original) +++ trunk/libzypp/zypp/sat/Repo.h Thu Nov 29 13:10:09 2007 @@ -56,6 +56,9 @@ /** Evaluate \ref Repo in a boolean context (\c != \c norepo). */ using base::SafeBool<Repo>::operator bool_type; + /** Return whether this is the system repo. */ + bool isSystemRepo() const; + public: /** The repos name (alias?). */ std::string name() const; Modified: trunk/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.cc?rev… ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.cc (original) +++ trunk/libzypp/zypp/sat/Solvable.cc Thu Nov 29 13:10:09 2007 @@ -57,6 +57,9 @@ return nosolvable; } + bool Solvable::isSystem() const + { return repo().isSystemRepo(); } + NameId Solvable::name() const { NO_SOLVABLE_RETURN( NameId() ); @@ -96,7 +99,8 @@ if ( ! obj ) return str << "sat::solvable()"; - return str << "sat::solvable(" << obj.id() << "|" << obj.name() << '-' << obj.evr() << '.' << obj.arch() << "){" + return str << "sat::solvable(" << obj.id() << "|" + << obj.name() << '-' << obj.evr() << '.' << obj.arch() << "){" << obj.repo().name() << "}"; } Modified: trunk/libzypp/zypp/sat/Solvable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.h?rev=… ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.h (original) +++ trunk/libzypp/zypp/sat/Solvable.h Thu Nov 29 13:10:09 2007 @@ -50,12 +50,16 @@ /** Evaluate \ref Solvable in a boolean context (\c != \c nosolvable). */ using base::SafeBool<Solvable>::operator bool_type; + /** Return whether this \ref Solvable belongs to the system repo. */ + bool isSystem() const; + public: NameId name() const; EvrId evr() const; ArchId arch() const; VendorId vendor() const; + public: Repo repo() const; public: -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7975 - in /trunk/libzypp/zypp/sat/detail: PoolImpl.cc PoolImpl.h
by mlandres＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: mlandres Date: Thu Nov 29 13:09:32 2007 New Revision: 7975 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7975&view=rev Log: set default pool architecture to ZConfig value Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc trunk/libzypp/zypp/sat/detail/PoolImpl.h Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl… ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Thu Nov 29 13:09:32 2007 @@ -9,18 +9,14 @@ /** \file zypp/sat/detail/PoolImpl.cc * */ -extern "C" -{ -#include <satsolver/solvable.h> -#include <satsolver/repo.h> -#include <satsolver/pool.h> -} - #include <iostream> + #include "zypp/base/Logger.h" #include "zypp/base/Gettext.h" #include "zypp/base/Exception.h" +#include "zypp/ZConfig.h" + #include "zypp/sat/detail/PoolImpl.h" using std::endl; @@ -37,10 +33,10 @@ void logSat( struct _Pool *, void *data, int type, const char *logString ) { - if ((type & (SAT_FATAL|SAT_ERROR)) == 0) { - _MIL("satsolver") << logString; - } else { + if ((type & (SAT_FATAL|SAT_ERROR))) { _ERR("satsolver") << logString; + } else { + _DBG("satsolver") << logString; } } @@ -69,8 +65,11 @@ } // initialialize logging bool verbose = ( getenv("ZYPP_FULLLOG") || getenv("ZYPP_LIBSAT_FULLLOG") ); - ::pool_setdebuglevel (_pool, verbose ? 5 : 2); - ::pool_setdebugcallback(_pool, logSat, NULL ); + ::pool_setdebuglevel( _pool, verbose ? 5 : 2 ); + ::pool_setdebugcallback( _pool, logSat, NULL ); + + // set pool architecture + ::pool_setarch( _pool, ZConfig::instance().systemArchitecture().asString().c_str() ); } /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl… ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.h (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.h Thu Nov 29 13:09:32 2007 @@ -16,6 +16,7 @@ #include <satsolver/pool.h> #include <satsolver/repo.h> #include <satsolver/solvable.h> +#include <satsolver/poolarch.h> #include <satsolver/repo_solv.h> } #include <iosfwd> @@ -126,11 +127,11 @@ return noSolvableId; } - private: - /** sat-pool. */ - ::_Pool * _pool; - /** Serial number. */ - SerialNumber _serial; + private: + /** sat-pool. */ + ::_Pool * _pool; + /** Serial number. */ + SerialNumber _serial; }; /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7974 - /trunk/libzypp/zypp/sat/detail/PoolImpl.cc
by schubi2＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: schubi2 Date: Thu Nov 29 12:53:18 2007 New Revision: 7974 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7974&view=rev Log: bugfix Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl… ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Thu Nov 29 12:53:18 2007 @@ -40,7 +40,7 @@ if ((type & (SAT_FATAL|SAT_ERROR)) == 0) { _MIL("satsolver") << logString; } else { - _DBG("satsolver") << logString; + _ERR("satsolver") << logString; } } @@ -69,7 +69,7 @@ } // initialialize logging bool verbose = ( getenv("ZYPP_FULLLOG") || getenv("ZYPP_LIBSAT_FULLLOG") ); - ::pool_setdebuglevel (_pool, verbose ? SAT_DEBUG_SCHUBI : SAT_DEBUG_STATS); + ::pool_setdebuglevel (_pool, verbose ? 5 : 2); ::pool_setdebugcallback(_pool, logSat, NULL ); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7973 - /trunk/sat-solver/src/policy.c
by schubi2＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: schubi2 Date: Thu Nov 29 11:28:07 2007 New Revision: 7973 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7973&view=rev Log: bugfix Modified: trunk/sat-solver/src/policy.c Modified: trunk/sat-solver/src/policy.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=7973… ============================================================================== --- trunk/sat-solver/src/policy.c (original) +++ trunk/sat-solver/src/policy.c Thu Nov 29 11:28:07 2007 @@ -224,9 +224,6 @@ return; POOL_DEBUG(SAT_DEBUG_POLICY, "prune_to_best_version %d\n", plist->count); - /* prune to best architecture */ - if (pool->id2arch) - prune_best_version_arch_sortcmp_data = pool; /* sort by name first */ qsort(plist->elements, plist->count, sizeof(Id), prune_best_version_arch_sortcmp); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7972 - in /trunk/sat-solver/src: solver.c solver.h
by mlschroe＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: mlschroe Date: Thu Nov 29 10:42:47 2007 New Revision: 7972 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7972&view=rev Log: - rename findproblemrule to solver_findproblemrule Modified: trunk/sat-solver/src/solver.c trunk/sat-solver/src/solver.h Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7972… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Nov 29 10:42:47 2007 @@ -2992,7 +2992,7 @@ } Id -findproblemrule(Solver *solv, Id problem) +solver_findproblemrule(Solver *solv, Id problem) { Id reqr, conr, sysr, jobr; Id idx = solv->problems.elements[problem - 1]; @@ -3017,7 +3017,7 @@ Id dep, source, target; Solvable *s, *s2; - probr = findproblemrule(solv, problem); + probr = solver_findproblemrule(solv, problem); switch (solver_problemruleinfo(solv, job, probr, &dep, &source, &target)) { case SOLVER_PROBLEM_UPDATE_RULE: Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=7972… ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Thu Nov 29 10:42:47 2007 @@ -142,8 +142,8 @@ extern Id solver_next_problem(Solver *solv, Id problem); extern Id solver_next_solution(Solver *solv, Id problem, Id solution); extern Id solver_next_solutionelement(Solver *solv, Id problem, Id solution, Id element, Id *p, Id *rp); +extern Id solver_findproblemrule(Solver *solv, Id problem); extern SolverProbleminfo solver_problemruleinfo(Solver *solv, Queue *job, Id rid, Id *depp, Id *sourcep, Id *targetp); -extern Id findproblemrule(Solver *solv, Id problem); /* debug functions, do not use */ void printdecisions(Solver *solv); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0