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

pull/13098/merge
James Cammarata 9 years ago
parent 937584cd52
commit 76ae577519

@ -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()

@ -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

@ -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

Loading…
Cancel
Save