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

Format /etc/locale.gen correctly on gen_locale

Browse source 
Prior to this change, the ``file.replace`` call matches an end-of-line character, which changes a file from:
```
...
# en_US.UTF-8 UTF-8
# en_ZA ISO-8859-1
...
```
to
```
...
en_US.UTF-8 UTF-8# en_ZA ISO-8859-1
...
``` 
which is incorrectly formatted -- the newline char being removed means the whole section after the whitespace is considered the charset.  See http://www.man-online.org/page/5-locale.gen/.

This may fix #24827.
This commit is contained in:
David Beitey 2015-07-10 15:09:06 +10:00 • committed by rallytime
parent 2f0f59b6cb
commit 44d44ec574
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/localemod.py
View file

@ -286,7 +286,7 @@ def gen_locale(locale, **kwargs):
__salt__['file.replace'](
'/etc/locale.gen',
r'^\s*#\s*{0}\s*$'.format(locale),
'{0}'.format(locale),
'{0}\\n'.format(locale),
append_if_not_found=True
)
elif on_ubuntu: