diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
| commit | ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e (patch) | |
| tree | 6a738f64b517992eed10c3d5891bbb27840202e4 /morphlib/artifactresolver.py | |
| parent | fe4486c1ec69c520a2c0aee7b52c35b57808120e (diff) | |
| parent | 597f2a19363b7e91b928d814627c9236779998fb (diff) | |
| download | morph-ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richardmaw/S11284/morphologies-by-path-v4'
Reviewed-by: Sam Thursfield
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'morphlib/artifactresolver.py')
| -rw-r--r-- | morphlib/artifactresolver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/artifactresolver.py b/morphlib/artifactresolver.py index 00976eb7..c18042a3 100644 --- a/morphlib/artifactresolver.py +++ b/morphlib/artifactresolver.py @@ -142,7 +142,7 @@ class ArtifactResolver(object): stratum_source = self._source_pool.lookup( info.get('repo') or source.repo_name, info.get('ref') or source.original_ref, - '%s.morph' % info['morph']) + morphlib.util.sanitise_morphology_path(info['morph'])) stratum_name = stratum_source.morphology['name'] matches, overlaps, unmatched = source.split_rules.partition( @@ -167,7 +167,7 @@ class ArtifactResolver(object): other_source = self._source_pool.lookup( stratum_info.get('repo') or source.repo_name, stratum_info.get('ref') or source.original_ref, - '%s.morph' % stratum_info['morph']) + morphlib.util.sanitise_morphology_path(stratum_info['morph'])) # Make every stratum artifact this stratum source produces # depend on every stratum artifact the other stratum source @@ -194,7 +194,7 @@ class ArtifactResolver(object): chunk_source = self._source_pool.lookup( info['repo'], info['ref'], - '%s.morph' % info['morph']) + morphlib.util.sanitise_morphology_path(info['morph'])) chunk_name = chunk_source.morphology['name'] |