summaryrefslogtreecommitdiff
path: root/cloudinit/util.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-03-07 09:54:04 -0500
committerScott Moser <smoser@ubuntu.com>2012-03-07 09:54:04 -0500
commit3703ed74cea613e96f3d882e90af1cadae30a092 (patch)
tree6f365ea0e55a8a9706d013875501c1fc931728b9 /cloudinit/util.py
parentea7ccdb7c118661b8e2487e5b6c7c00fda4e0c85 (diff)
downloadvyos-cloud-init-3703ed74cea613e96f3d882e90af1cadae30a092.tar.gz
vyos-cloud-init-3703ed74cea613e96f3d882e90af1cadae30a092.zip
fix pylint and pep8 warnings
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r--cloudinit/util.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 897f0a0d..35d194ba 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -752,6 +752,7 @@ def mount_callback_umount(device, callback, data=None):
return(ret)
+
def wait_for_url(urls, max_wait=None, timeout=None,
status_cb=None, headers_cb=None):
"""
@@ -826,10 +827,9 @@ def wait_for_url(urls, max_wait=None, timeout=None,
except Exception as e:
reason = "unexpected error [%s]" % e
- if log:
- status_cb("'%s' failed [%s/%ss]: %s" %
- (url, int(time.time() - starttime), max_wait,
- reason))
+ status_cb("'%s' failed [%s/%ss]: %s" %
+ (url, int(time.time() - starttime), max_wait,
+ reason))
if timeup(max_wait, starttime):
break
@@ -838,5 +838,3 @@ def wait_for_url(urls, max_wait=None, timeout=None,
time.sleep(sleeptime)
return False
-
-