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

Ensure environment is inherited properly (task->block/include->play)

Browse Source
This commit is contained in:
James Cammarata
2015-11-09 14:51:07 -05:00
parent 937584cd52
commit 76ae577519
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/playbook/base.py
View File

@@ -442,7 +442,7 @@ class Base:
new_value = [ new_value ]
#return list(set(value + new_value))
return [i for i,_ in itertools.groupby(value + new_value)]
return [i for i,_ in itertools.groupby(value + new_value) if i is not None]
def __getstate__(self):
return self.serialize()

5
lib/ansible/playbook/block.py
View File

@@ -323,8 +323,9 @@ class Block(Base, Become, Conditional, Taggable):
Override for the 'tags' getattr fetcher, used from Base.
'''
environment = self._attributes['environment']
if environment is None:
environment = self._get_parent_attribute('environment', extend=True)
parent_environment = self._get_parent_attribute('environment', extend=True)
if parent_environment is not None:
environment = self._extend_value(environment, parent_environment)
return environment

6
lib/ansible/playbook/task.py
View File

@@ -383,8 +383,8 @@ class Task(Base, Conditional, Taggable, Become):
Override for the 'tags' getattr fetcher, used from Base.
'''
environment = self._attributes['environment']
if environment is None:
environment = self._get_parent_attribute('environment')
parent_environment = self._get_parent_attribute('environment', extend=True)
if parent_environment is not None:
environment = self._extend_value(environment, parent_environment)
return environment