Commit 4048baa5 authored by Aleksey Shirokih's avatar Aleksey Shirokih
Browse files

Before and depends can be in same service

parent def2ad33
...@@ -92,13 +92,11 @@ class Service(Model): ...@@ -92,13 +92,11 @@ class Service(Model):
for d in srv_descr[srv]["meta"]["depends"]: for d in srv_descr[srv]["meta"]["depends"]:
if d not in deps: if d not in deps:
deps[d] = [] deps[d] = []
elif "before" in srv_descr[srv]["meta"]:
deps[srv_descr[srv]["meta"]["before"]] = [srv]
if srv not in deps:
deps[srv] = []
else: else:
if srv not in deps: if srv not in deps:
deps[srv] = [] deps[srv] = []
if "before" in srv_descr[srv]["meta"]:
deps[srv_descr[srv]["meta"]["before"]].extend([srv])
order = dfs_topsort(deps) order = dfs_topsort(deps)
return order return order
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment