From 264413bcb9d5adaeb6815565cd099ea06e43e532 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 14 Oct 2010 17:21:11 -0400 Subject: Handle regular socket errors gracefully in ipa command ticket 382 --- ipalib/rpc.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ipalib/rpc.py') 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)) -- cgit