From bca746c947a3526016d726499d5a584211f43c72 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 21 Nov 2011 15:02:42 +0100
Subject: [PATCH] Don't consider a revert to level 1 (base level) in sat solver
 a failure

---
 src/Composer/DependencyResolver/Solver.php | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php
index ba15144cd..926e8ce0b 100644
--- a/src/Composer/DependencyResolver/Solver.php
+++ b/src/Composer/DependencyResolver/Solver.php
@@ -1748,12 +1748,14 @@ class Solver
 
         while (true) {
 
-            $conflictRule = $this->propagate($level);
-            if ($conflictRule !== null) {
-                if ($this->analyzeUnsolvable($conflictRule, $disableRules)) {
-                    continue;
-                } else {
-                    return;
+            if (1 === $level) {
+                $conflictRule = $this->propagate($level);
+                if ($conflictRule !== null) {
+                    if ($this->analyzeUnsolvable($conflictRule, $disableRules)) {
+                        continue;
+                    } else {
+                        return;
+                    }
                 }
             }
 
@@ -1989,7 +1991,11 @@ class Solver
                     return;
                 }
 
-                if ($level < $systemLevel || $level == 1) {
+                // open suse sat-solver uses this, but why is $level == 1 trouble?
+                // SYSTEMSOLVABLE related? we don't have that, so should work
+                //if ($level < $systemLevel || $level == 1) {
+
+                if ($level < $systemLevel) {
                     break; // trouble
                 }
 
@@ -1997,9 +2003,6 @@ class Solver
                 $n = -1;
             }
 
-//            $this->printDecisionMap();
-//            $this->printDecisionQueue();
-
             // minimization step
             if (count($this->branches)) {