From dbb482ec95b6e0110a32df000893880f4b92abeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 27 Feb 2015 16:05:17 +0000 Subject: morphlib/sourceresolver.py: Do not duplicate what is already done in load_from_string() --- morphlib/sourceresolver.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index cd183ee0..5be373a8 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -292,19 +292,14 @@ class SourceResolver(object): return self._resolved_morphologies[key] loader = morphlib.morphloader.MorphologyLoader() - morph = None text = self._get_file_contents(reponame, sha1, filename) morph = loader.load_from_string(text) - if morph is None: - return None - else: - loader.validate(morph) - loader.set_commands(morph) - loader.set_defaults(morph) + if morph is not None: self._resolved_morphologies[key] = morph - return morph + + return morph def _detect_build_system(self, reponame, sha1, expected_filename): '''Attempt to detect buildsystem of the given commit. -- cgit v1.2.1