From 90c8770bb5c4068561431c56779eabcce881432d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 24 Feb 2015 23:00:47 +0000 Subject: morphlib/sourceresolver.py: Do not fail if VERSION file doesn't exist --- morphlib/sourceresolver.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index 8d656ce4..e1c434ac 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -94,11 +94,6 @@ class FileNotYamlError(SourceResolverError): # pragma: no cover SourceResolverError.__init__( self, "Syntax error in filename %s:\n%s" % filename, errmsg) -class VersionNotFoundError(SourceResolverError): # pragma: no cover - def __init__(self): - SourceResolverError.__init__( - self, "Couldn't find VERSION file") - class MorphologyNotFoundError(SourceResolverError): # pragma: no cover def __init__(self, filename): SourceResolverError.__init__( @@ -358,17 +353,15 @@ class SourceResolver(object): version = self._get_file_contents( definitions_repo, definitions_absref, 'VERSION') - if version is None: - raise VersionNotFoundError() - - try: - obj = yaml.safe_load(version) - except yaml.error.YAMLError as e: - raise FileNotYamlError(morph_filename, e) + if version is not None: + try: + obj = yaml.safe_load(version) + except yaml.error.YAMLError as e: + raise FileNotYamlError(morph_filename, e) - version_n = obj['version'] - if version_n != 0: - raise UnknownVersionError(version_n) + version_n = obj['version'] + if version_n != 0: + raise UnknownVersionError(version_n) def _process_definitions_with_children(self, system_filenames, definitions_repo, -- cgit v1.2.1