[Notes] [Git][BuildStream/buildstream][master] 2 commits: sandbox/_sandboxremote.py: Use helpers to set up cwd and env

[Jürg Billeter <gitlab mg gitlab com>]

Title: GitLab

Jürg Billeter pushed to branch master at BuildStream / buildstream

Commits:

• 5f4ae90b
  by Jürg Billeter at 2018-10-02T06:34:02Z

  sandbox/_sandboxremote.py: Use helpers to set up cwd and env
  
  This matches the other sandbox implementations.
  

• 0458bc4e
  by Jürg Billeter at 2018-10-02T07:08:35Z

  Merge branch 'juerg/sandbox' into 'master'
  
  sandbox/_sandboxremote.py: Use helpers to set up cwd and env
  
  See merge request BuildStream/buildstream!841

1 changed file:

• buildstream/sandbox/_sandboxremote.py

Changes:

buildstream/sandbox/_sandboxremote.py

---

...	...	@@ -177,15 +177,11 @@ class SandboxRemote(Sandbox):
177	177	if not cascache.verify_digest_pushed(self._get_project(), upload_vdir.ref):
178	178	raise SandboxError("Failed to verify that source has been pushed to the remote artifact cache.")
179	179
180		- # Set up environment and working directory
181		- if cwd is None:
182		- cwd = self._get_work_directory()
183		-
184		- if cwd is None:
185		- cwd = '/'
186		-
187		- if env is None:
188		- env = self._get_environment()
	180	+ # Fallback to the sandbox default settings for
	181	+ # the cwd and env.
	182	+ #
	183	+ cwd = self._get_work_directory(cwd=cwd)
	184	+ env = self._get_environment(cwd=cwd, env=env)
189	185
190	186	# We want command args as a list of strings
191	187	if isinstance(command, str):

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