Merge "Always return Resource from ResourceDefinition.dependencies()"

This commit is contained in:
Jenkins 2017-07-26 12:47:19 +00:00 committed by Gerrit Code Review
commit 68ec1941fc

View File

@ -220,7 +220,8 @@ class ResourceDefinition(object):
def strict_func_deps(data, datapath):
return six.moves.filter(
lambda r: getattr(r, 'strict_dependency', True),
function.dependencies(data, datapath))
six.moves.map(lambda rp: stack[rp.name],
function.dependencies(data, datapath)))
explicit_depends = [] if self._depends is None else self._depends
prop_deps = strict_func_deps(self._properties, path('Properties'))