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-24 23:06:05 +0000 |
| commit | bfeea6a3945472617f6bfa4179495354ffda1462 (patch) | |
| tree | e420fe709feaa25d807d37a6ff423e6ae20662c8 /morphlib/sourceresolver.py | |
| parent | 4cae325e984d052db35bf6239ef542b1ac0f7fa0 (diff) | |
| download | morph-bfeea6a3945472617f6bfa4179495354ffda1462.tar.gz | |
Remove support for definitions version 6
Change-Id: I603b5172902b5249874ea3bb90de59db5a908185
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) |