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

Fixes #11055 - Set locale via LC_ALL

Browse source
This commit is contained in:
Mathieu 2015-10-19 21:25:30 +02:00
parent 9a29fee991
commit 260a3e5ce7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -735,8 +735,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'
except Exception, e: except Exception, e:
self.fail_json(msg="An unknown error was encountered while attempting to validate the locale: %s" % e) self.fail_json(msg="An unknown error was encountered while attempting to validate the locale: %s" % e)

4
lib/ansible/runner/shell_plugins/sh.py
View file

@ -24,8 +24,8 @@ class ShellModule(object):
def env_prefix(self, **kwargs): def env_prefix(self, **kwargs):
'''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,
) )
env.update(kwargs) env.update(kwargs)
return ' '.join(['%s=%s' % (k, pipes.quote(unicode(v))) for k,v in env.items()]) return ' '.join(['%s=%s' % (k, pipes.quote(unicode(v))) for k,v in env.items()])