cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/mathieumd/ansible into mathieumd-devel

Browse source
This commit is contained in:
James Cammarata 2015-10-21 13:59:51 -04:00
commit 0e447e3f41
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/basic.py
View file

@ -1039,8 +1039,8 @@ class AnsibleModule(object):
# issues but is preferable to simply failing because # issues but is preferable to simply failing because
# of an unknown locale # of an unknown locale
locale.setlocale(locale.LC_ALL, 'C') locale.setlocale(locale.LC_ALL, 'C')
os.environ['LANG'] = 'C' os.environ['LANG'] = 'C'
os.environ['LC_CTYPE'] = 'C' os.environ['LC_ALL'] = 'C'
os.environ['LC_MESSAGES'] = 'C' os.environ['LC_MESSAGES'] = 'C'
except Exception: except Exception:
e = get_exception() e = get_exception()

2
lib/ansible/plugins/shell/sh.py
View file

@ -38,7 +38,7 @@ class ShellModule(object):
'''Build command prefix with environment variables.''' '''Build command prefix with environment variables.'''
env = dict( env = dict(
LANG = C.DEFAULT_MODULE_LANG, LANG = C.DEFAULT_MODULE_LANG,
LC_CTYPE = C.DEFAULT_MODULE_LANG, LC_ALL = C.DEFAULT_MODULE_LANG,
LC_MESSAGES = C.DEFAULT_MODULE_LANG, LC_MESSAGES = C.DEFAULT_MODULE_LANG,
) )
env.update(kwargs) env.update(kwargs)