diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-12-07 15:02:21 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-03-25 20:57:32 +0000 |
| commit | 9404317020ff0455cbfd3ca7976d546af823759b (patch) | |
| tree | 75bf789db3643366f17fd78434f8a85512aa6756 /morphlib/definitions_repo.py | |
| parent | 575c40c7c28bca4ff18979b6e1b76d5cdfa9841f (diff) | |
| download | morph-9404317020ff0455cbfd3ca7976d546af823759b.tar.gz | |
Remove support for definitions version 6
Change-Id: I603b5172902b5249874ea3bb90de59db5a908185
Diffstat (limited to 'morphlib/definitions_repo.py')
| -rw-r--r-- | morphlib/definitions_repo.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/morphlib/definitions_repo.py b/morphlib/definitions_repo.py index 8b022867..9fc4e734 100644 --- a/morphlib/definitions_repo.py +++ b/morphlib/definitions_repo.py @@ -229,15 +229,8 @@ class DefinitionsRepo(gitdir.GitDirectory): defaults_text = mf.read_file('DEFAULTS', allow_missing=True) - if version < 7: - if defaults_text is not None: - warnings.warn( - "Ignoring DEFAULTS file, because these definitions are " - "version %i" % 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(version, text=defaults_text) |