summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2019-02-18 08:06:43 +0100
committerJürg Billeter <j@bitron.ch>2019-02-18 11:29:25 +0100
commitfb65af6c63b0e7057934bb2402f77c99ab36bd67 (patch)
tree1b9fa2e19b91df137025336306c7e71867d34dfc
parentc79696febe054e317af89f355646bbb3ae59bc8d (diff)
downloadbuildstream-fb65af6c63b0e7057934bb2402f77c99ab36bd67.tar.gz
_casbaseddirectory.py: Fix order in _recalculate_recursing_up()
The directory needs to be serialized after the Digest for the subdirectory `caller` has been updated.
-rw-r--r--buildstream/storage/_casbaseddirectory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py
index 96a7aa79d..86b5e11d2 100644
--- a/buildstream/storage/_casbaseddirectory.py
+++ b/buildstream/storage/_casbaseddirectory.py
@@ -136,10 +136,10 @@ class CasBasedDirectory(Directory):
the parent).
"""
- self.ref = self.cas_cache.add_object(buffer=self.pb2_directory.SerializeToString())
if caller:
old_dir = self._find_pb2_entry(caller.filename)
self.cas_cache.add_object(digest=old_dir.digest, buffer=caller.pb2_directory.SerializeToString())
+ self.ref = self.cas_cache.add_object(buffer=self.pb2_directory.SerializeToString())
if self.parent:
self.parent._recalculate_recursing_up(self)