From 340a9a87aec71582330135d1455331d8cf90907a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 24 Feb 2015 21:38:55 +0000 Subject: morphlib/sourceresolver.py: Move VERSION file checks to a function --- morphlib/sourceresolver.py | 22 +++++++++++++--------- 1 file 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() -- cgit v1.2.1