diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-22 15:55:44 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-22 15:55:44 +0100 |
commit | 901ffbe0cb7554150b40f5ee40648b338df36eba (patch) | |
tree | 43ef4512d031383af62433df2578395693fb515b /morphlib/morph2.py | |
parent | 4be1620dca24d539573027831b65ffc040bc1ebb (diff) | |
parent | fc5bb595b123db557d2b10a8d570d25e14119686 (diff) | |
download | morph-901ffbe0cb7554150b40f5ee40648b338df36eba.tar.gz |
Merge branch 'baserock/richardmaw-os/chunks-in-defs-v3'
Reviewed-by: Daniel Silverstone
Reviewed-by: Sam Thursfield
Diffstat (limited to 'morphlib/morph2.py')
-rw-r--r-- | morphlib/morph2.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/morphlib/morph2.py b/morphlib/morph2.py index 83971bb8..b49c0f73 100644 --- a/morphlib/morph2.py +++ b/morphlib/morph2.py @@ -191,8 +191,6 @@ class Morphology(object): for source in self['chunks']: if 'repo' not in source: self._set_default_value(source, 'repo', source['name']) - if 'morph' not in source: - self._set_default_value(source, 'morph', source['name']) if 'build-depends' not in source: self._set_default_value(source, 'build-depends', None) if 'build-mode' not in source: @@ -226,7 +224,7 @@ class Morphology(object): return info elif self['kind'] == 'stratum': for info in self['chunks']: - source_name = info.get('alias', info['morph']) + source_name = info.get('alias', info['name']) if source_name == name: return info raise KeyError('"%s" not found' % name) |