Logic corrections for assemblage keyword, metadatastaging/010

3 files changed, 7 insertions, 15 deletions

diff --git a/ybd/__main__.py b/ybd/__main__.py
index 0dbc3e7..9586f3f 100755
--- a/ybd/__main__.py
+++ b/ybd/__main__.py
@@ -61,8 +61,6 @@ def build_assemblage(actuator, target):
     with sandbox.setup(target):
       install_contents(target)
       build(actuator, target, target['contents'])
-    write_metadata(target)
-    cache(target)
 
 print('')
 original_cwd = os.getcwd()
diff --git a/ybd/assembly.py b/ybd/assembly.py
index b57b8d9..2edb483 100644
--- a/ybd/assembly.py
+++ b/ybd/assembly.py
@@ -132,7 +132,7 @@ def build(actuator, dn, contents):
 
         with timer(dn, 'artifact creation'):
 
-            if dn.get('kind', 'chunk') == 'system':
+            if dn.get('kind', 'chunk') == 'assemblage':
                 install_split_artifacts(dn)
 
             write_metadata(dn)
diff --git a/ybd/splitting.py b/ybd/splitting.py
index 71b1540..2a45b1a 100644
--- a/ybd/splitting.py
+++ b/ybd/splitting.py
@@ -144,14 +144,9 @@ def get_metadata(dn):
     built artifact
 
     '''
-    try:
-        with open(path_to_metafile(dn), "r") as f:
-            metadata = yaml.safe_load(f)
-        log(dn, 'Loaded metadata', dn['path'], verbose=True)
-        return metadata
-    except:
-        log(dn, 'WARNING: problem loading metadata', dn)
-        return None
+    with open(path_to_metafile(dn), "r") as f:
+        metadata = yaml.safe_load(f)
+    return metadata
 
 
 def path_to_metafile(dn):
@@ -181,7 +176,7 @@ def compile_rules(dn):
 def write_metadata(dn):
     if dn.get('kind', 'chunk') == 'chunk':
         write_chunk_metafile(dn)
-    elif dn.get('kind', 'chunk') == 'stratum':
+    elif dn.get('kind', 'chunk') == 'assemblage':
         write_stratum_metafiles(dn)
     if config.get('check-overlaps', 'ignore') != 'ignore':
         check_overlaps(dn)
@@ -221,8 +216,7 @@ def write_stratum_metafiles(stratum):
     log(stratum['name'], 'Splitting', stratum.get('kind'))
     rules, splits = compile_rules(stratum)
 
-    for item in stratum['contents']:
-        chunk = app.defs.get(item)
+    for chunk in stratum['contents']:
         if chunk.get('build-mode', 'staging') == 'bootstrap':
             continue
 
@@ -234,7 +228,7 @@ def write_stratum_metafiles(stratum):
         if config.get('artifact-version', 0) not in range(0, 1):
             split_metadata['cache'] = metadata.get('cache')
 
-        chunk_artifacts = app.defs.get(chunk).get('artifacts', {})
+        chunk_artifacts = chunk.get('artifacts', {})
         for artifact, target in chunk_artifacts.items():
             splits[target].append(artifact)