saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #25204 from viktorkrivak/develop

Browse source 
Fix list render in apache
This commit is contained in:
Mike Place 2015-07-07 10:31:40 -06:00
commit cebf56c870
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/apache.py
View file

@ -403,7 +403,8 @@ def _parse_config(conf, slot=None):
else:
print('{0}'.format(conf), file=ret, end='')
elif isinstance(conf, list):
print('{0} {1}'.format(str(slot), ' '.join(conf)), file=ret, end='')
for value in conf:
print(_parse_config(value, str(slot)), file=ret)
elif isinstance(conf, dict):
print('<{0} {1}>'.format(
slot,
@ -415,7 +416,7 @@ def _parse_config(conf, slot=None):
if isinstance(value, str):
print('{0} {1}'.format(key, value), file=ret)
elif isinstance(value, list):
print('{0} {1}'.format(key, ' '.join(value)), file=ret)
print(_parse_config(value, key), file=ret)
elif isinstance(value, dict):
print(_parse_config(value, key), file=ret)
print('</{0}>'.format(slot), file=ret, end='')