summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2015-01-22 17:09:22 +0100
committerTomas Babej <tbabej@redhat.com>2015-02-12 17:10:10 +0100
commitd5035c0ed99c03e25d5890e4d6f12f1079e8d892 (patch)
tree70fa549e7bf85203fd5c3ce06ca8170100633a81 /ipapython
parent9549a5984b5b1d7106035d8126a3ead915b2129b (diff)
downloadfreeipa-d5035c0ed99c03e25d5890e4d6f12f1079e8d892.tar.gz
freeipa-d5035c0ed99c03e25d5890e4d6f12f1079e8d892.tar.xz
freeipa-d5035c0ed99c03e25d5890e4d6f12f1079e8d892.zip
Prevent install scripts fail silently if timeout exceeded
socket.timeout() exceptions need description, otherwise no error message is printed on console. Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ipautil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 45b334d0a..4116d974e 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -1150,7 +1150,7 @@ def wait_for_open_ports(host, ports, timeout=0):
if port_open:
break
if timeout and time.time() > op_timeout: # timeout exceeded
- raise socket.timeout()
+ raise socket.timeout("Timeout exceeded")
time.sleep(1)
def wait_for_open_socket(socket_name, timeout=0):