Merge branch 'devel' of https://github.com/mathieumd/ansible into mathieumd-devel
This commit is contained in:
commit
0e447e3f41
2 changed files with 3 additions and 3 deletions
|
@ -1039,8 +1039,8 @@ class AnsibleModule(object):
|
|||
# issues but is preferable to simply failing because
|
||||
# of an unknown locale
|
||||
locale.setlocale(locale.LC_ALL, 'C')
|
||||
os.environ['LANG'] = 'C'
|
||||
os.environ['LC_CTYPE'] = 'C'
|
||||
os.environ['LANG'] = 'C'
|
||||
os.environ['LC_ALL'] = 'C'
|
||||
os.environ['LC_MESSAGES'] = 'C'
|
||||
except Exception:
|
||||
e = get_exception()
|
||||
|
|
|
@ -38,7 +38,7 @@ class ShellModule(object):
|
|||
'''Build command prefix with environment variables.'''
|
||||
env = dict(
|
||||
LANG = C.DEFAULT_MODULE_LANG,
|
||||
LC_CTYPE = C.DEFAULT_MODULE_LANG,
|
||||
LC_ALL = C.DEFAULT_MODULE_LANG,
|
||||
LC_MESSAGES = C.DEFAULT_MODULE_LANG,
|
||||
)
|
||||
env.update(kwargs)
|
||||
|
|
Loading…
Reference in a new issue