diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2018-10-26 09:26:36 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2018-10-26 09:26:36 +0000 |
| commit | 494d7018ec16f90bb917b3fe0cbbc4d8893febec (patch) | |
| tree | f11db91899e6d5c9c6f89d4e46fe599e061e3f23 | |
| parent | 356d84cdce6c44516d09ab561e10545434e4a609 (diff) | |
| parent | 8c41b5b8cefcaeb98e163324d07e4441a8b5edf6 (diff) | |
| download | buildstream-494d7018ec16f90bb917b3fe0cbbc4d8893febec.tar.gz | |
Merge branch 'danielsilverstone-ct/do-not-reinsert-yaml' into 'master'
_yaml.py: Do not insert into cache if retrieved from cache
See merge request BuildStream/buildstream!902
| -rw-r--r-- | buildstream/_yaml.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/buildstream/_yaml.py b/buildstream/_yaml.py index 90784636d..940ca81e5 100644 --- a/buildstream/_yaml.py +++ b/buildstream/_yaml.py @@ -204,9 +204,8 @@ def load(filename, shortname=None, copy_tree=False, *, project=None, yaml_cache= if not data: data = load_data(contents, file, copy_tree=copy_tree) - - if yaml_cache: - yaml_cache.put_from_key(project, filename, key, data) + if yaml_cache: + yaml_cache.put_from_key(project, filename, key, data) return data except FileNotFoundError as e: |