valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Under Python 2.6, curly braces in strings to .format() MUST be indexed.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-11-11 06:33:57 +00:00
parent 9d498ee099
commit 6dde259fa5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/kmod.py
View File

@ -88,7 +88,9 @@ def _set_persistent_module(mod):
return set()
escape_mod = re.escape(mod)
## If module is commented only uncomment it
if __salt__['file.contains_regex_multiline'](conf, "^#[\t ]*{}[\t ]*$".format(escape_mod)):
if __salt__['file.contains_regex_multiline'](conf,
'^#[\t ]*{0}[\t ]*$'.format(
escape_mod)):
__salt__['file.uncomment'](conf, escape_mod)
else:
__salt__['file.append'](conf, mod)
@ -106,9 +108,9 @@ def _remove_persistent_module(mod, comment):
return set()
escape_mod = re.escape(mod)
if comment:
__salt__['file.comment'](conf, "^[\t ]*{}[\t ]?".format(escape_mod))
__salt__['file.comment'](conf, '^[\t ]*{0}[\t ]?'.format(escape_mod))
else:
__salt__['file.sed'](conf, "^[\t ]*{}[\t ]?".format(escape_mod), '')
__salt__['file.sed'](conf, '^[\t ]*{0}[\t ]?'.format(escape_mod), '')
return set([mod_name])