(2.10) Some fixes in _GenerateKVMBlockDevicesOptions()

[ganeti-local] / lib / utils / retry.py

diff --git a/lib/utils/retry.py b/lib/utils/retry.py
index c8959bf..12d1014 100644 (file)
--- a/lib/utils/retry.py
+++ b/lib/utils/retry.py
@@ -160,7 +160,7 @@ def Retry(fn, delay, timeout, args=None, wait_fn=time.sleep,
   while True:
     retry_args = []
     try:
-      # pylint: disable-msg=W0142
+      # pylint: disable=W0142
       return fn(*args)
     except RetryAgain, err:
       retry_args = err.args
@@ -170,11 +170,11 @@ def Retry(fn, delay, timeout, args=None, wait_fn=time.sleep,
 
     remaining_time = end_time - _time_fn()
 
-    if remaining_time < 0.0:
-      # pylint: disable-msg=W0142
+    if remaining_time <= 0.0:
+      # pylint: disable=W0142
       raise RetryTimeout(*retry_args)
 
-    assert remaining_time >= 0.0
+    assert remaining_time > 0.0
 
     if calc_delay is None:
       wait_fn(remaining_time)
@@ -206,8 +206,9 @@ def SimpleRetry(expected, fn, delay, timeout, args=None, wait_fn=time.sleep,
 
   """
   rdict = {}
+
   def helper(*innerargs):
-    # pylint: disable-msg=W0142
+    # pylint: disable=W0142
     result = rdict["result"] = fn(*innerargs)
     if not ((callable(expected) and expected(result)) or result == expected):
       raise RetryAgain()