diff options
| author | Jürg Billeter <j@bitron.ch> | 2019-02-27 18:19:38 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-08 14:55:39 +0000 |
| commit | f96d93c6f150e904ee2bfad7f1938cfcdc5e7112 (patch) | |
| tree | 6c55dccfb0520be1cb45e790992be6ed8a792a9d | |
| parent | 2247917b2af1f5ab842c068897a956657178fb57 (diff) | |
| download | buildstream-f96d93c6f150e904ee2bfad7f1938cfcdc5e7112.tar.gz | |
_sandboxremote.py: Remove support for FileBasedDirectory as sandbox root
Remote execution should always use CasBasedDirectory.
| -rw-r--r-- | buildstream/sandbox/_sandboxremote.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/buildstream/sandbox/_sandboxremote.py b/buildstream/sandbox/_sandboxremote.py index 6a0f1e6d0..bd9f4633b 100644 --- a/buildstream/sandbox/_sandboxremote.py +++ b/buildstream/sandbox/_sandboxremote.py @@ -30,7 +30,6 @@ from .. import utils from .._message import Message, MessageType from . import Sandbox, SandboxCommandError from .sandbox import _SandboxBatch -from ..storage._filebaseddirectory import FileBasedDirectory from ..storage._casbaseddirectory import CasBasedDirectory from .. import _signals from .._protos.build.bazel.remote.execution.v2 import remote_execution_pb2, remote_execution_pb2_grpc @@ -306,10 +305,6 @@ class SandboxRemote(Sandbox): # set up virtual dircetory upload_vdir = self.get_virtual_directory() cascache = self._get_context().get_cascache() - if isinstance(upload_vdir, FileBasedDirectory): - # Make a new temporary directory to put source in - upload_vdir = CasBasedDirectory(cascache) - upload_vdir.import_files(self.get_virtual_directory()._get_underlying_directory()) # Create directories for all marked directories. This emulates # some of the behaviour of other sandboxes, which create these |