diff options
author | Dan Firth <dan.firth@codethink.co.uk> | 2013-09-27 11:16:56 +0000 |
---|---|---|
committer | Dan Firth <dan.firth@codethink.co.uk> | 2013-09-27 11:16:56 +0000 |
commit | 5e0ad6ad29fa776088241828580d58b7d91e9fd1 (patch) | |
tree | ca7bd78b3fc6f484ddb8407fb444d991617d9b39 /morphlib/morphloader.py | |
parent | 1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c (diff) | |
download | morph-5e0ad6ad29fa776088241828580d58b7d91e9fd1.tar.gz |
Dropped support for 'system-kind' from system morphology files
Diffstat (limited to 'morphlib/morphloader.py')
-rw-r--r-- | morphlib/morphloader.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index 9b134509..aea87777 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -62,14 +62,6 @@ class UnknownArchitectureError(morphlib.Error): 'Unknown architecture %s in morphology %s' % (arch, morphology)) -class InvalidSystemKindError(morphlib.Error): - - def __init__(self, system_kind, morphology): - self.msg = ( - 'system-kind %s not allowed (must be rootfs-tarball), in %s' % - (system_kind, morphology)) - - class NoBuildDependenciesError(morphlib.Error): def __init__(self, stratum_name, chunk_name, morphology): @@ -144,7 +136,6 @@ class MorphologyLoader(object): 'strata': [], 'description': '', 'arch': None, - 'system-kind': 'rootfs-tarball', 'configuration-extensions': [], }, 'cluster': {}, @@ -259,12 +250,6 @@ class MorphologyLoader(object): if morph['arch'] not in morphlib.valid_archs: raise UnknownArchitectureError(morph['arch'], morph.filename) - # If system-kind is present, it must be rootfs-tarball. - if 'system-kind' in morph: - if morph['system-kind'] not in (None, 'rootfs-tarball'): - raise InvalidSystemKindError( - morph['system-kind'], morph.filename) - def _validate_stratum(self, morph): # Require at least one chunk. if len(morph.get('chunks', [])) == 0: |