internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix environment setting and inheritence

Browse Source 
Fixes #11401
This commit is contained in:
James Cammarata
2015-07-21 13:52:51 -04:00
parent 29a9b8ab7d
commit 66a8864ae9
6 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/ansible/plugins/action/__init__.py
View File

@@ -81,11 +81,20 @@ class ActionBase:
Builds the environment string to be used when executing the remote task.
'''
if self._task.environment:
if type(self._task.environment) != dict:
raise errors.AnsibleError("environment must be a dictionary, received %s" % self._task.environment)
final_environment = dict()
if self._task.environment is not None:
environments = self._task.environment
if not isinstance(environments, list):
environments = [ environments ]
return self._connection._shell.env_prefix(**self._task.environment)
for environment in environments:
if type(environment) != dict:
raise errors.AnsibleError("environment must be a dictionary, received %s" % environment)
# very deliberatly using update here instead of combine_vars, as
# these environment settings should not need to merge sub-dicts
final_environment.update(environment)
return self._connection._shell.env_prefix(**final_environment)
def _early_needs_tmp_path(self):
'''