internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify the way we set the localization environment

Browse Source 
Previously, we set the LANG (and LC_CTYPE) environment variables
directly in the module code and applied them with os.environ().
Instead, we are now pre-pending those variables to the environment
string used to execute the command which allows the user to
override the localization values by setting the environment values
directly (even on a per-task basis):

  - subversion: repo=file:///path/to/repos/svn_über dest=/tmp/svntest
    environment:
      LANG: "C"
      LC_CTYPE: "en_US.UTF-8"

So if a user wishes to default their LANG back to C, they can still
avoid unicode issues by doing the above.

Fixes #7060
This commit is contained in:
James Cammarata
2014-05-01 10:34:53 -05:00
parent 40a7a306f5
commit 54b1f820fb
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ansible/runner/__init__.py
View File

@@ -287,15 +287,21 @@ class Runner(object):
def _compute_environment_string(self, inject=None):
''' what environment variables to use when running the command? '''
if not self.environment:
return ""
enviro = template.template(self.basedir, self.environment, inject, convert_bare=True)
enviro = utils.safe_eval(enviro)
if type(enviro) != dict:
raise errors.AnsibleError("environment must be a dictionary, received %s" % enviro)
default_environment = collections.OrderedDict([
('LANG', C.DEFAULT_MODULE_LANG),
('LC_CTYPE', C.DEFAULT_MODULE_LANG),
])
if self.environment:
enviro = template.template(self.basedir, self.environment, inject, convert_bare=True)
enviro = utils.safe_eval(enviro)
if type(enviro) != dict:
raise errors.AnsibleError("environment must be a dictionary, received %s" % enviro)
default_environment.update(enviro)
result = ""
for (k,v) in enviro.iteritems():
result = "%s=%s %s" % (k, pipes.quote(unicode(v)), result)
for (k,v) in default_environment.iteritems():
result = "%s %s=%s" % (result, k, pipes.quote(unicode(v)))
return result
# *****************************************************