Use correct DS instance in ipactl status
Make sure ipactl status check for correct DS instance. It should check for 'dirsrv@IPA-REALM' and not 'dirsrv.target'. https://fedorahosted.org/freeipa/ticket/3730
This commit is contained in:
1 parent
8d6d8459eb
commit
3b93df4e4e
2 files changed
+31
-13
No files matched your search
@@ -58,9 +58,10 @@ except ImportError:
|
||||
"""This exception is raised when a process run by check_call() returns
|
||||
a non-zero exit status. The exit status will be stored in the
|
||||
returncode attribute."""
|
||||
def __init__(self, returncode, cmd):
|
||||
def __init__(self, returncode, cmd, output=None):
|
||||
self.returncode = returncode
|
||||
self.cmd = cmd
|
||||
self.output = output
|
||||
def __str__(self):
|
||||
return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
|
||||
|
||||
@@ -319,7 +320,7 @@ def run(args, stdin=None, raiseonerr=True,
|
||||
root_logger.debug('stderr=%s' % stderr)
|
||||
|
||||
if p.returncode != 0 and raiseonerr:
|
||||
raise CalledProcessError(p.returncode, arg_string)
|
||||
raise CalledProcessError(p.returncode, arg_string, stdout)
|
||||
|
||||
return (stdout, stderr, p.returncode)
|
||||
|
||||
|
||||
Reference in new issue
Block a user