[Notes] [Git][BuildStream/buildstream][bschubert/fix-command-sandbox] Check is command is a str and replace by list before checking existence

[Benjamin Schubert <gitlab mg gitlab com>]

Title: GitLab

Benjamin Schubert pushed to branch bschubert/fix-command-sandbox at BuildStream / buildstream

Commits:

• f6ebfb40
  by Benjamin Schubert at 2018-10-25T11:01:17Z

  Check is 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.
  

1 changed file:

• buildstream/sandbox/_sandboxbwrap.py

Changes:

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	+ # We want command args as a list of strings
	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)

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