Make show-dep command ignore local dependencies
Closes-Bug: #1614986 Change-Id: Ia5f5f6f8412eea1f2a9a4c97b7875475b3e1b0d0
This commit is contained in:
committed by
Eric Lemoine
parent
900a61c184
commit
9a63f13ac8
@@ -72,7 +72,8 @@ def _parse_service_deps(service_map):
|
||||
for container in service_map['service']['containers']:
|
||||
dependencies.update(container['daemon'].get('dependencies', []))
|
||||
for pre in container.get('pre', []):
|
||||
dependencies.update([pre['name']])
|
||||
if pre.get('type') == 'single':
|
||||
dependencies.update([pre['name']])
|
||||
return list(dependencies)
|
||||
|
||||
|
||||
@@ -87,12 +88,13 @@ def _parse_pre_and_post_deps(service_map):
|
||||
service_map['service']['name'])
|
||||
|
||||
for post in container.get('post', []):
|
||||
post_deps = post.get('dependencies', [])
|
||||
post_deps.append(service_map['service']['name'])
|
||||
deps[post['name']] = Node(post['name'],
|
||||
'job',
|
||||
post_deps,
|
||||
service_map['service']['name'])
|
||||
if post.get('type') == 'single':
|
||||
post_deps = post.get('dependencies', [])
|
||||
post_deps.append(service_map['service']['name'])
|
||||
deps[post['name']] = Node(post['name'],
|
||||
'job',
|
||||
post_deps,
|
||||
service_map['service']['name'])
|
||||
return deps
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user