summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/dsinstance.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2009-11-30 15:28:09 -0500
committerRob Crittenden <rcritten@redhat.com>2009-11-30 15:28:41 -0500
commit7c2c2d6130648fb6dd7c0e52d802cc6eff39ef95 (patch)
treedd7e58b79a237757406bca959c2fff733ad09798 /ipaserver/install/dsinstance.py
parent29aa8fb05dbebe96ba44a4f6547cb7580562ef48 (diff)
downloadfreeipa-7c2c2d6130648fb6dd7c0e52d802cc6eff39ef95.tar.gz
freeipa-7c2c2d6130648fb6dd7c0e52d802cc6eff39ef95.tar.xz
freeipa-7c2c2d6130648fb6dd7c0e52d802cc6eff39ef95.zip
Add option to have ipautil.run() not raise an exception
There are times where a caller will want to determine the course of action based on the returncode instead of relying on it != 0. This also lets the caller get the contents of stdout and stderr.
Diffstat (limited to 'ipaserver/install/dsinstance.py')
-rw-r--r--ipaserver/install/dsinstance.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 60436dee2..5eff32e25 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -105,7 +105,7 @@ def is_ds_running():
"""
ret = True
try:
- (sout, serr) = ipautil.run(["/sbin/service", "dirsrv", "status"])
+ (sout, serr, rcode) = ipautil.run(["/sbin/service", "dirsrv", "status"])
if sout.find("is stopped") >= 0:
ret = False
except ipautil.CalledProcessError: