mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Refactor ipautil.run
The ipautil.run function now returns an object with returncode and output are accessible as attributes. The stdout and stderr of all commands are logged (unless skip_output is given). The stdout/stderr contents must be explicitly requested with a keyword argument, otherwise they are None. This is because in Python 3, the output needs to be decoded, and that can fail if it's not decodable (human-readable) text. The raw (bytes) output is always available from the result object, as is "leniently" decoded output suitable for logging. All calls are changed to reflect this. A use of Popen in cainstance is changed to ipautil.run. Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
committed by
Jan Cholasta
parent
4cc206b0f8
commit
099cf98307
@@ -279,9 +279,9 @@ class pwpolicy(LDAPObject):
|
||||
has_lockout = False
|
||||
lockout_params = ()
|
||||
|
||||
(stdout, stderr, rc) = run(['klist', '-V'], raiseonerr=False)
|
||||
if rc == 0:
|
||||
verstr = stdout.split()[-1]
|
||||
result = run(['klist', '-V'], raiseonerr=False, capture_output=True)
|
||||
if result.returncode == 0:
|
||||
verstr = result.output.split()[-1]
|
||||
ver = version.LooseVersion(verstr)
|
||||
min = version.LooseVersion(MIN_KRB5KDC_WITH_LOCKOUT)
|
||||
if ver >= min:
|
||||
|
||||
Reference in New Issue
Block a user