IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

use ipautil.CalledProcessError instead of CalledProcessError

Browse Source
This commit is contained in:
Rich Megginson 2008-11-04 16:33:43 -07:00 committed by Rob Crittenden
parent 5f6f20ffaa
commit 4ed44a06a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipa-server/ipaserver/dsinstance.py
View File

@ -111,7 +111,7 @@ def is_ds_running():
try: try:
(sout, serr) = ipautil.run(["/sbin/service", "dirsrv", "status"]) (sout, serr) = ipautil.run(["/sbin/service", "dirsrv", "status"])
if sout.find("is stopped") >= 0: if sout.find("is stopped") >= 0:
ret = False ret = False
except ipautil.CalledProcessError: except ipautil.CalledProcessError:
ret = False ret = False
return ret return ret
@ -469,8 +469,8 @@ class DsInstance(service.Service):
status = True status = True
try: try:
certdb.load_cacert(cacert_fname) certdb.load_cacert(cacert_fname)
except CalledProcessError, e: except ipalib.CalledProcessError, e:
logging.critical("Error importaing CA cert file named [%s]: %s" % logging.critical("Error importing CA cert file named [%s]: %s" %
(cacert_fname, str(e))) (cacert_fname, str(e)))
status = False status = False
# restart the directory server # restart the directory server