Enabled SAT solver via default. (removed ZYPP_SAT_SOLVER)

ZYPP_RC_SOLVER=1 will enable the old RedCapet solver

diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index 297799090cacd045f05f1e633d6c3a722b141f31..d4ef567ad8c21f854db191b919d0d0c95b38221c 100644 (file)
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -1291,7 +1291,7 @@ Resolver::resolvePool( bool tryAllPossibilities )
 {
 
     // Solving with the satsolver
-    if ( getenv("ZYPP_SAT_SOLVER")) {
+    if ( !getenv("ZYPP_RC_SOLVER")) {
        MIL << "-------------- Calling SAT Solver -------------------" << endl;
        if ( !_satResolver ) { 
            // syncing with sat pool

diff --git a/zypp/solver/detail/Resolver_problems.cc b/zypp/solver/detail/Resolver_problems.cc
index 3be215fa0822c08fd7d3f3d3c26d49dab856f8a9..7a5536afc90d0312661bb114747a678f5e394997 100644 (file)
--- a/zypp/solver/detail/Resolver_problems.cc
+++ b/zypp/solver/detail/Resolver_problems.cc
@@ -346,7 +346,7 @@ moreDetails( ResolverContext_Ptr context, PoolItem_Ref item )
 ResolverProblemList
 Resolver::problems (const bool ignoreValidSolution) const
 {
-    if ( getenv("ZYPP_SAT_SOLVER") && _satResolver )
+    if ( !getenv("ZYPP_RC_SOLVER") && _satResolver )
        return _satResolver->problems();
            
     ResolverProblemList problems;