summaryrefslogtreecommitdiff
path: root/ybd
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2016-07-06 17:27:47 +0100
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2016-07-06 17:53:23 +0100
commit2f25e36ab3d0647ff0895684a231f484327ef34f (patch)
tree264467f5bebfd729f2a5b83c70cbb5ee51a40c6e /ybd
parent03c09d065f0d49a189a67c864030dc7def063335 (diff)
downloadybd-2f25e36ab3d0647ff0895684a231f484327ef34f.tar.gz
Compose subsystems before systems
Diffstat (limited to 'ybd')
-rw-r--r--ybd/assembly.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/ybd/assembly.py b/ybd/assembly.py
index 78c53d3..34f278a 100644
--- a/ybd/assembly.py
+++ b/ybd/assembly.py
@@ -64,9 +64,10 @@ def compose(dn):
systems = dn.get('systems', [])
shuffle(systems)
for system in systems:
- compose(system['path'])
- for subsystem in system.get('subsystems', []):
+ for s in system.get('subsystems', []):
+ subsystem = app.defs.get(s['path'])
compose(subsystem)
+ compose(system['path'])
with sandbox.setup(dn):
install_contents(dn)