[Notes] [Git][BuildStream/buildstream][bschubert/fix-command-sandbox] 3 commits: _yaml.py: Do not insert into cache if retrieved from cache

[Benjamin Schubert <gitlab mg gitlab com>]

Title: GitLab

Benjamin Schubert pushed to branch bschubert/fix-command-sandbox 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

• 80762ecb
  by Benjamin Schubert at 2018-10-26T09:45:39Z

  Check if command is a str and replace by list before checking existence
  
  Currently we would make sure the sandbox had a command before
  converting it to a list if it was given as a string. That meant that a string
  command would never exist and the check be invalid.
  
  This also adds the same logic in the dummy sandbox for consistency.
  

4 changed files:

• buildstream/_yaml.py
• buildstream/sandbox/_sandboxbwrap.py
• buildstream/sandbox/_sandboxchroot.py
• buildstream/sandbox/_sandboxdummy.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:

buildstream/sandbox/_sandboxbwrap.py

---

...	...	@@ -66,15 +66,15 @@ class SandboxBwrap(Sandbox):
66	66	cwd = self._get_work_directory(cwd=cwd)
67	67	env = self._get_environment(cwd=cwd, env=env)
68	68
	69	+ # Convert single-string argument to a list
	70	+ if isinstance(command, str):
	71	+ command = [command]
	72	+
69	73	if not self._has_command(command[0], env):
70	74	raise SandboxError("Staged artifacts do not provide command "
71	75	"'{}'".format(command[0]),
72	76	reason='missing-command')
73	77
74		- # We want command args as a list of strings
75		- if isinstance(command, str):
76		- command = [command]
77		-
78	78	# Create the mount map, this will tell us where
79	79	# each mount point needs to be mounted from and to
80	80	mount_map = MountMap(self, flags & SandboxFlags.ROOT_READ_ONLY)

buildstream/sandbox/_sandboxchroot.py

---

...	...	@@ -57,15 +57,15 @@ class SandboxChroot(Sandbox):
57	57	cwd = self._get_work_directory(cwd=cwd)
58	58	env = self._get_environment(cwd=cwd, env=env)
59	59
	60	+ # Convert single-string argument to a list
	61	+ if isinstance(command, str):
	62	+ command = [command]
	63	+
60	64	if not self._has_command(command[0], env):
61	65	raise SandboxError("Staged artifacts do not provide command "
62	66	"'{}'".format(command[0]),
63	67	reason='missing-command')
64	68
65		- # Command must be a list
66		- if isinstance(command, str):
67		- command = [command]
68		-
69	69	stdout, stderr = self._get_output()
70	70
71	71	# Create the mount map, this will tell us where

buildstream/sandbox/_sandboxdummy.py

---

...	...	@@ -33,6 +33,10 @@ class SandboxDummy(Sandbox):
33	33	cwd = self._get_work_directory(cwd=cwd)
34	34	env = self._get_environment(cwd=cwd, env=env)
35	35
	36	+ # Convert single-string argument to a list
	37	+ if isinstance(command, str):
	38	+ command = [command]
	39	+
36	40	if not self._has_command(command[0], env):
37	41	raise SandboxError("Staged artifacts do not provide command "
38	42	"'{}'".format(command[0]),

—
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.