summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2019-02-27 11:02:32 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-01 05:11:55 +0000
commit108d404ae4c3ea8638d800d53e4c93c5ec6e046a (patch)
treeb802c2c1f6b856dd80bdd238bb7edb173a417e87
parented7877bf73c6b82ad844c8305017e2588c15ae41 (diff)
downloadbuildstream-108d404ae4c3ea8638d800d53e4c93c5ec6e046a.tar.gz
_sandboxremote.py: Use Directory._get_digest() instead of Directory.ref
This is in preparation for lazy digest calculation.
-rw-r--r--buildstream/sandbox/_sandboxremote.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/sandbox/_sandboxremote.py b/buildstream/sandbox/_sandboxremote.py
index e97b37abd..fbec1709e 100644
--- a/buildstream/sandbox/_sandboxremote.py
+++ b/buildstream/sandbox/_sandboxremote.py
@@ -314,7 +314,7 @@ class SandboxRemote(Sandbox):
upload_vdir.recalculate_hash()
# Generate action_digest first
- input_root_digest = upload_vdir.ref
+ input_root_digest = upload_vdir._get_digest()
command_proto = self._create_command(command, cwd, env)
command_digest = utils._message_digest(command_proto.SerializeToString())
action = remote_execution_pb2.Action(command_digest=command_digest,
@@ -346,7 +346,7 @@ class SandboxRemote(Sandbox):
except grpc.RpcError as e:
raise SandboxError("Failed to push source directory to remote: {}".format(e)) from e
- if not casremote.verify_digest_on_remote(upload_vdir.ref):
+ if not casremote.verify_digest_on_remote(upload_vdir._get_digest()):
raise SandboxError("Failed to verify that source has been pushed to the remote artifact cache.")
# Push command and action