[yum-commits] docs/yum.conf.5 yum/depsolve.py

[zpavlas at osuosl.org]

 docs/yum.conf.5 |    2 +-
 yum/depsolve.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cfd0f0f8ad4bb285755ecc66e528a807f864b4ca
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Wed Dec 11 15:09:28 2013 +0100

    depsolve_loop_limit=<forever> should try forever

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index da13dc8..48ced00 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -882,7 +882,7 @@ Default is: !*/swap !*/lv_swap glob:/etc/yum/fssnap.d/*.conf
 Set the number of times any attempt to depsolve before we just give up. This
 shouldn't be needed as yum should always solve or fail, however it has been
 observed that it can loop forever with very large system upgrades. Setting
-this to `0' (or "forever") makes yum try forever. Default is `100'.
+this to `0' (or "<forever>") makes yum try forever. Default is `100'.
 
 
 .SH "[repository] OPTIONS"
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 8b438bb..81bfdf8 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -870,7 +870,7 @@ class Depsolve(object):
         if self.dsCallback: self.dsCallback.start()
 
         depsolve_loop_count = 0
-        while depsolve_loop_count < self.conf.depsolve_loop_limit:
+        while depsolve_loop_count != (self.conf.depsolve_loop_limit or -1):
             depsolve_loop_count += 1
 
             CheckDeps = True