diff options
Diffstat (limited to 'morphlib/sourceresolver.py')
| -rw-r--r-- | morphlib/sourceresolver.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index f8dac8b1..5d04ece9 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -232,15 +232,8 @@ class SourceResolver(object): defaults_text = self._get_file_contents_from_definitions( definitions_checkout_dir, 'DEFAULTS') - if definitions_version < 7: - if defaults_text is not None: - warnings.warn( - "Ignoring DEFAULTS file, because these definitions are " - "version %i" % definitions_version) - defaults_text = None - else: - if defaults_text is None: - warnings.warn("No DEFAULTS file found.") + if defaults_text is None: + warnings.warn("No DEFAULTS file found.") defaults = morphlib.defaults.Defaults(definitions_version, text=defaults_text) |