summaryrefslogtreecommitdiffstats
path: root/ipalib/rpc.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2010-10-14 17:21:11 -0400
committerRob Crittenden <rcritten@redhat.com>2010-10-15 15:02:18 -0400
commit264413bcb9d5adaeb6815565cd099ea06e43e532 (patch)
tree1c4d265ffb7d9f56c0dadf0f9c1fac5790e2f73a /ipalib/rpc.py
parent2f6fa22ab0daa129526beee710bf3c6bd4244dd4 (diff)
downloadfreeipa-264413bcb9d5adaeb6815565cd099ea06e43e532.tar.gz
freeipa-264413bcb9d5adaeb6815565cd099ea06e43e532.tar.xz
freeipa-264413bcb9d5adaeb6815565cd099ea06e43e532.zip
Handle regular socket errors gracefully in ipa command
ticket 382
Diffstat (limited to 'ipalib/rpc.py')
-rw-r--r--ipalib/rpc.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 4c2cf94e8..6977fc77e 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -43,6 +43,7 @@ from ipalib import errors
from ipalib.request import context
from ipapython import ipautil, dnsclient
import httplib
+import socket
from ipapython.nsslib import NSSHTTPS, NSSConnection
from nss.error import NSPRError
from urllib2 import urlparse
@@ -370,3 +371,5 @@ class xmlclient(Connectible):
raise NetworkError(uri=server, error=str(e))
except ProtocolError, e:
raise NetworkError(uri=server, error=e.errmsg)
+ except socket.error, e:
+ raise NetworkError(uri=server, error=str(e))