diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-02 12:49:36 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-05 13:59:30 +0000 |
| commit | 0ed681e693ab7932ff839ff0270834ebb16baf1a (patch) | |
| tree | dd212fe89cc30c65d12b0c18df6650a8e7226791 | |
| parent | 22232a808ed8f0ebb86c545ea9bdc2834b1302e7 (diff) | |
| download | morph-0ed681e693ab7932ff839ff0270834ebb16baf1a.tar.gz | |
morphloader: Hoist buildsystem lookup outside of loops
Change-Id: If548a9962d5e70480f7eaba6ab6596465975e894
| -rw-r--r-- | morphlib/morphloader.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index 78778b3c..b5e27f70 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -773,24 +773,24 @@ class MorphologyLoader(object): morph['max-jobs'] = int(morph['max-jobs']) def _unset_chunk_defaults(self, morph): # pragma: no cover + default_bs = self._static_defaults['chunk']['build-system'] + bs = morphlib.buildsystem.lookup_build_system( + morph.get('build-system', default_bs)) for key in self._static_defaults['chunk']: if key not in morph: continue if 'commands' not in key: continue attr = key.replace('-', '_') - default_bs = self._static_defaults['chunk']['build-system'] - bs = morphlib.buildsystem.lookup_build_system( - morph.get('build-system', default_bs)) default_value = getattr(bs, attr) if morph[key] == default_value: del morph[key] def set_commands(self, morph): + default = self._static_defaults['chunk']['build-system'] + bs = morphlib.buildsystem.lookup_build_system( + morph.get('build-system', default)) if morph['kind'] == 'chunk': for key in self._static_defaults['chunk']: if 'commands' not in key: continue if key not in morph: attr = '_'.join(key.split('-')) - default = self._static_defaults['chunk']['build-system'] - bs = morphlib.buildsystem.lookup_build_system( - morph.get('build-system', default)) morph[key] = getattr(bs, attr) |