From 3c0b288b6f2ceaef0d5a6d4fd57f8131791b8af6 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 4 Nov 2008 16:33:43 -0700 Subject: use ipautil.CalledProcessError instead of CalledProcessError --- ipa-server/ipaserver/dsinstance.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipa-server') diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py index 1dae1b6ca..e9826bf68 100644 --- a/ipa-server/ipaserver/dsinstance.py +++ b/ipa-server/ipaserver/dsinstance.py @@ -111,7 +111,7 @@ def is_ds_running(): try: (sout, serr) = ipautil.run(["/sbin/service", "dirsrv", "status"]) if sout.find("is stopped") >= 0: - ret = False + ret = False except ipautil.CalledProcessError: ret = False return ret @@ -469,8 +469,8 @@ class DsInstance(service.Service): status = True try: certdb.load_cacert(cacert_fname) - except CalledProcessError, e: - logging.critical("Error importaing CA cert file named [%s]: %s" % + except ipalib.CalledProcessError, e: + logging.critical("Error importing CA cert file named [%s]: %s" % (cacert_fname, str(e))) status = False # restart the directory server -- cgit