summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-10-14 09:36:26 -0400
committerRob Crittenden <rcritten@redhat.com>2011-10-13 16:37:12 -0400
commitf4ec8a2fa45c630310d18cc36b8da459103b31cc (patch)
tree9a5ea8b5d3dff2b341deb6efcc2c2d0a850b8271
parentda4b447bd030603982e7b3d5a60888de673639fd (diff)
downloadfreeipa-f4ec8a2fa45c630310d18cc36b8da459103b31cc.zip
freeipa-f4ec8a2fa45c630310d18cc36b8da459103b31cc.tar.gz
freeipa-f4ec8a2fa45c630310d18cc36b8da459103b31cc.tar.xz
Handle an empty value in a name/value pair in config_replace_variables()
This would blow up if you tried to append a value to an entry that looked like: NAME= https://fedorahosted.org/freeipa/ticket/1983
-rw-r--r--ipapython/ipautil.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index b002594..75e8e6f 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -1235,7 +1235,9 @@ $)''', re.VERBOSE)
old_values[option] = value
if appendvars and option in appendvars:
# append new value unless it is already existing in the original one
- if value.find(appendvars[option]) == -1:
+ if not value:
+ new_line = u"%s=%s\n" % (option, appendvars[option])
+ elif value.find(appendvars[option]) == -1:
new_line = u"%s=%s %s\n" % (option, value, appendvars[option])
old_values[option] = value
new_config.write(new_line)