[yum-commits] yum/depsolve.py

[zpavlas at osuosl.org]

 yum/depsolve.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 57f063c11cc8712ce8055d9e9429d897d7d0072c
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Thu Dec 12 10:32:49 2013 +0100

    Test depsolve_loop_count vs depsolve_loop_limit only once

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 81bfdf8..95c21bc 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -870,7 +870,9 @@ class Depsolve(object):
         if self.dsCallback: self.dsCallback.start()
 
         depsolve_loop_count = 0
-        while depsolve_loop_count != (self.conf.depsolve_loop_limit or -1):
+        while True:
+            if depsolve_loop_count == (self.conf.depsolve_loop_limit or -1):
+                return (1, [_("Depsolving loop limit reached.")] + unique(errors))
             depsolve_loop_count += 1
 
             CheckDeps = True
@@ -922,9 +924,6 @@ class Depsolve(object):
 
             break
 
-        if depsolve_loop_count >= self.conf.depsolve_loop_limit:
-            return (1, [_("Depsolving loop limit reached.")] + unique(errors))
-
         # FIXME: this doesn't belong here at all...
         for txmbr in self.tsInfo.getMembers():
             if self.allowedMultipleInstalls(txmbr.po) and \