diff options
| author | Javier Jardón <javier.jardon@codethink.co.uk> | 2015-02-24 21:38:55 +0000 |
|---|---|---|
| committer | Javier Jardón <javier.jardon@codethink.co.uk> | 2015-02-27 18:42:52 +0000 |
| commit | 340a9a87aec71582330135d1455331d8cf90907a (patch) | |
| tree | eca112523ac85ecf19e2c31d73cf731f1dea9562 | |
| parent | da638bab2c09c7eea91ce7c60cbbe0f551ccd60a (diff) | |
| download | morph-340a9a87aec71582330135d1455331d8cf90907a.tar.gz | |
morphlib/sourceresolver.py: Move VERSION file checks to a function
| -rw-r--r-- | morphlib/sourceresolver.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index 0489a4ec..bdad9a97 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -348,15 +348,8 @@ class SourceResolver(object): loader.set_defaults(morph) return morph - def _process_definitions_with_children(self, system_filenames, - definitions_repo, - definitions_ref, - definitions_absref, - definitions_tree, - visit): # pragma: no cover - definitions_queue = collections.deque(system_filenames) - chunk_queue = set() - + def _check_version_file(self,definitions_repo, + definitions_absref): # pragma: no cover version = self._get_file_contents( definitions_repo, definitions_absref, 'VERSION') @@ -368,6 +361,17 @@ class SourceResolver(object): except yaml.error.YAMLError as e: raise FileNotYamlError(morph_filename, e) + def _process_definitions_with_children(self, system_filenames, + definitions_repo, + definitions_ref, + definitions_absref, + definitions_tree, + visit): # pragma: no cover + definitions_queue = collections.deque(system_filenames) + chunk_queue = set() + + self._check_version_file(definitions_repo, definitions_absref) + while definitions_queue: filename = definitions_queue.popleft() |