summaryrefslogtreecommitdiff
path: root/morphlib/artifactresolver.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-07-22 15:55:44 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2014-07-22 15:55:44 +0100
commit901ffbe0cb7554150b40f5ee40648b338df36eba (patch)
tree43ef4512d031383af62433df2578395693fb515b /morphlib/artifactresolver.py
parent4be1620dca24d539573027831b65ffc040bc1ebb (diff)
parentfc5bb595b123db557d2b10a8d570d25e14119686 (diff)
downloadmorph-901ffbe0cb7554150b40f5ee40648b338df36eba.tar.gz
Merge branch 'baserock/richardmaw-os/chunks-in-defs-v3'
Reviewed-by: Daniel Silverstone Reviewed-by: Sam Thursfield
Diffstat (limited to 'morphlib/artifactresolver.py')
-rw-r--r--morphlib/artifactresolver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/morphlib/artifactresolver.py b/morphlib/artifactresolver.py
index c18042a3..9e3cea48 100644
--- a/morphlib/artifactresolver.py
+++ b/morphlib/artifactresolver.py
@@ -191,10 +191,12 @@ class ArtifactResolver(object):
name_to_processed_artifacts = {}
for info in source.morphology['chunks']:
+ filename = morphlib.util.sanitise_morphology_path(
+ info.get('morph', info['name']))
chunk_source = self._source_pool.lookup(
info['repo'],
info['ref'],
- morphlib.util.sanitise_morphology_path(info['morph']))
+ filename)
chunk_name = chunk_source.morphology['name']