summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2008-11-04 16:33:43 -0700
committerRob Crittenden <rcritten@redhat.com>2008-11-04 21:57:52 -0500
commit3c0b288b6f2ceaef0d5a6d4fd57f8131791b8af6 (patch)
treec48a9d044efbbdc1cea0e89cddd082df2a599a5b
parentd5885659de3473a1ce75c685553967f8ca6a7e71 (diff)
downloadfreeipa-3c0b288b6f2ceaef0d5a6d4fd57f8131791b8af6.zip
freeipa-3c0b288b6f2ceaef0d5a6d4fd57f8131791b8af6.tar.gz
freeipa-3c0b288b6f2ceaef0d5a6d4fd57f8131791b8af6.tar.xz
use ipautil.CalledProcessError instead of CalledProcessError
-rw-r--r--ipa-server/ipaserver/dsinstance.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py
index 1dae1b6..e9826bf 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