diff options
Diffstat (limited to 'buildstream/sandbox/_sandboxremote.py')
| -rw-r--r-- | buildstream/sandbox/_sandboxremote.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/buildstream/sandbox/_sandboxremote.py b/buildstream/sandbox/_sandboxremote.py index d934832bb..ab0c31bff 100644 --- a/buildstream/sandbox/_sandboxremote.py +++ b/buildstream/sandbox/_sandboxremote.py @@ -177,15 +177,11 @@ class SandboxRemote(Sandbox): if not cascache.verify_digest_pushed(self._get_project(), upload_vdir.ref): raise SandboxError("Failed to verify that source has been pushed to the remote artifact cache.") - # Set up environment and working directory - if cwd is None: - cwd = self._get_work_directory() - - if cwd is None: - cwd = '/' - - if env is None: - env = self._get_environment() + # Fallback to the sandbox default settings for + # the cwd and env. + # + cwd = self._get_work_directory(cwd=cwd) + env = self._get_environment(cwd=cwd, env=env) # We want command args as a list of strings if isinstance(command, str): |