From 7f3b39d87fedf4b0536f099232c4cd08454331da Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 1 Jun 2015 14:54:10 +0000 Subject: sourceresolver: bind util.sanitise_morphology_path It's too much of a mouthful to use a qualified import. Change-Id: Ide5695e49fd6188b520fecce9d6b076fd7280b8e --- morphlib/sourceresolver.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'morphlib') 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)) -- cgit v1.2.1