summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2011-01-26 17:37:46 -0500
committerSimo Sorce <ssorce@redhat.com>2011-01-27 09:36:26 -0500
commit740b689696debf0c066b6879ee865708dfcf1109 (patch)
treecf0b030ecfe726ad55fc9bf198334d5eb12bfde8 /ipapython
parent0eda5918f00c09112453966589bd6b8a339ba460 (diff)
downloadfreeipa-740b689696debf0c066b6879ee865708dfcf1109.tar.gz
freeipa-740b689696debf0c066b6879ee865708dfcf1109.tar.xz
freeipa-740b689696debf0c066b6879ee865708dfcf1109.zip
Handle nolog list containing None values
Fixes: https://fedorahosted.org/freeipa/ticket/856
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ipautil.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 88d083654..7a91dcba0 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -136,6 +136,8 @@ def run(args, stdin=None, raiseonerr=True,
# to log. Run through the nolog items.
args = ' '.join(args)
for value in nolog:
+ if not isinstance(value, basestring):
+ continue
args = args.replace(value, 'XXXXXXXX')
stdout = stdout.replace(value, 'XXXXXXXX')
stderr = stderr.replace(value, 'XXXXXXXX')