diff options
author | Jürg Billeter <j@bitron.ch> | 2019-11-28 17:55:19 +0100 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2019-12-07 17:33:41 +0100 |
commit | b6e9f9b8e986e9128d1db221fb047196eb83e714 (patch) | |
tree | a6352e934d62930c4c8990f4274741f33ce76919 | |
parent | 68323e10516b0a6758fd4ed5e07ded6af17c258b (diff) | |
download | buildstream-b6e9f9b8e986e9128d1db221fb047196eb83e714.tar.gz |
_sandboxreapi.py: Pass sandbox flags to _execute_action()
-rw-r--r-- | src/buildstream/sandbox/_sandboxreapi.py | 4 | ||||
-rw-r--r-- | src/buildstream/sandbox/_sandboxremote.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/buildstream/sandbox/_sandboxreapi.py b/src/buildstream/sandbox/_sandboxreapi.py index 834cdd8e0..ec31b97f1 100644 --- a/src/buildstream/sandbox/_sandboxreapi.py +++ b/src/buildstream/sandbox/_sandboxreapi.py @@ -70,7 +70,7 @@ class SandboxREAPI(Sandbox): command_digest = cascache.add_object(buffer=command_proto.SerializeToString()) action = remote_execution_pb2.Action(command_digest=command_digest, input_root_digest=input_root_digest) - action_result = self._execute_action(action) # pylint: disable=assignment-from-no-return + action_result = self._execute_action(action, flags) # pylint: disable=assignment-from-no-return # Get output of build self._process_job_output( @@ -148,7 +148,7 @@ class SandboxREAPI(Sandbox): def _create_batch(self, main_group, flags, *, collect=None): return _SandboxREAPIBatch(self, main_group, flags, collect=collect) - def _execute_action(self, action): + def _execute_action(self, action, flags): raise ImplError("Sandbox of type '{}' does not implement _execute_action()".format(type(self).__name__)) diff --git a/src/buildstream/sandbox/_sandboxremote.py b/src/buildstream/sandbox/_sandboxremote.py index d4ffd64a1..5ec1c974b 100644 --- a/src/buildstream/sandbox/_sandboxremote.py +++ b/src/buildstream/sandbox/_sandboxremote.py @@ -297,7 +297,7 @@ class SandboxRemote(SandboxREAPI): "{} output files are missing on the CAS server".format(len(remote_missing_blobs)) ) - def _execute_action(self, action): + def _execute_action(self, action, flags): context = self._get_context() project = self._get_project() cascache = context.get_cascache() |