From 740b689696debf0c066b6879ee865708dfcf1109 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Wed, 26 Jan 2011 17:37:46 -0500
Subject: Handle nolog list containing None values

Fixes: https://fedorahosted.org/freeipa/ticket/856
---
 ipapython/ipautil.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ipapython')

diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 88d08365..7a91dcba 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')
-- 
cgit