[Notes] [Git][BuildStream/buildstream][master] 2 commits: _yaml.py: Do not insert into cache if retrieved from cache

[Jonathan Maw <gitlab mg gitlab com>]

Title: GitLab

Jonathan Maw pushed to branch master at BuildStream / buildstream

Commits:

• 8c41b5b8
  by Daniel Silverstone at 2018-10-26T09:02:30Z

  _yaml.py: Do not insert into cache if retrieved from cache
  
  We were unconditionally inserting into the yaml cache anything we had
  retrieved from the yaml cache.  This had the side-effect of being expensive
  on re-runs of commands where yaml hadn't changed.
  
  Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>
  

• 494d7018
  by Jonathan Maw at 2018-10-26T09:26:36Z

  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

1 changed file:

• buildstream/_yaml.py

Changes:

buildstream/_yaml.py

---

...	...	@@ -204,9 +204,8 @@ def load(filename, shortname=None, copy_tree=False, *, project=None, yaml_cache=
204	204
205	205	if not data:
206	206	data = load_data(contents, file, copy_tree=copy_tree)
207		-
208		- if yaml_cache:
209		- yaml_cache.put_from_key(project, filename, key, data)
	207	+ if yaml_cache:
	208	+ yaml_cache.put_from_key(project, filename, key, data)
210	209
211	210	return data
212	211	except FileNotFoundError as e:

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.