diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-23 17:14:28 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-23 16:43:17 +0000 |
| commit | 1ae4b3d77bdf7f666c7817346baf08129a6247f3 (patch) | |
| tree | 0e7fb3cd057bc3f7b971a79dad897d1205945e32 /morphlib | |
| parent | 79eb63a0669842e2d8eff43f42683ed9ce28383a (diff) | |
| download | morph-1ae4b3d77bdf7f666c7817346baf08129a6247f3.tar.gz | |
Remove support for Baserock definitions format versions 0, 1 and 2
The previous release of the Baserock reference systems (baserock-15.25
tag) used Baserock definitions version 3, so this version of Morph can
still build the last release of the Baserock reference systems.
In the course of fixing up the cmdtest tests to use version 5
definitions, I removed a couple of bits of redundant code.
Change-Id: If9d480aa966d2ea5939cf04351f3d488cccea67f
Diffstat (limited to 'morphlib')
| -rw-r--r-- | morphlib/sourceresolver.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index 47d9502e..af704945 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -33,7 +33,7 @@ tree_cache_filename = 'trees.cache.pickle' buildsystem_cache_size = 10000 buildsystem_cache_filename = 'detected-chunk-buildsystems.cache.pickle' -supported_versions = [0, 1, 2, 3, 4, 5] +supported_versions = [3, 4, 5] class PickleCacheManager(object): # pragma: no cover '''Cache manager for PyLRU that reads and writes to Pickle files. @@ -320,7 +320,7 @@ class SourceResolver(object): definitions_checkout_dir, 'VERSION') if version_file == None: - return 0 # Assume version 0 if no version file + raise InvalidVersionFileError() version = self._parse_version_file(version_file) @@ -421,15 +421,8 @@ class SourceResolver(object): definitions_absref, path) if morphology is None: - if definitions_version > 1: - raise MorphologyReferenceNotFoundError( - path, filename) - else: - self.status( - msg="Warning! `%(path)s' referenced in " - "`%(stratum)s' does not exist", - path=path, - stratum=filename) + raise MorphologyReferenceNotFoundError( + path, filename) chunk_queue.add((c['repo'], c['ref'], path)) |