diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-01 14:54:10 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-05 12:54:45 +0000 |
| commit | 7f3b39d87fedf4b0536f099232c4cd08454331da (patch) | |
| tree | 63da046f4273b4695c6211e40a95917aaa3be27f | |
| parent | 810106852c4f100237aab3d02077048d302f5dd2 (diff) | |
| download | morph-7f3b39d87fedf4b0536f099232c4cd08454331da.tar.gz | |
sourceresolver: bind util.sanitise_morphology_path
It's too much of a mouthful to use a qualified import.
Change-Id: Ide5695e49fd6188b520fecce9d6b076fd7280b8e
| -rw-r--r-- | morphlib/sourceresolver.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index d0164b3b..3b87407f 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -26,6 +26,7 @@ import yaml import cliapp import morphlib +from morphlib.util import sanitise_morphology_path tree_cache_size = 10000 tree_cache_filename = 'trees.cache.pickle' @@ -426,12 +427,12 @@ class SourceResolver(object): "Cannot build a morphology of type 'cluster'.") elif morphology['kind'] == 'system': definitions_queue.extend( - morphlib.util.sanitise_morphology_path(s['morph']) + sanitise_morphology_path(s['morph']) for s in morphology['strata']) elif morphology['kind'] == 'stratum': if morphology['build-depends']: definitions_queue.extend( - morphlib.util.sanitise_morphology_path(s['morph']) + sanitise_morphology_path(s['morph']) for s in morphology['build-depends']) for c in morphology['chunks']: if 'morph' not in c: @@ -444,7 +445,7 @@ class SourceResolver(object): # All users should be specifying a full path to the # chunk morph file, using the 'morph' field, and this # code path should be removed. - path = morphlib.util.sanitise_morphology_path( + path = sanitise_morphology_path( c.get('morph', c['name'])) chunk_queue.add((c['repo'], c['ref'], path)) |