diff options
author | Jürg Billeter <j@bitron.ch> | 2019-02-27 11:17:05 +0100 |
---|---|---|
committer | Abderrahim Kitouni <akitouni@gnome.org> | 2020-08-26 12:47:05 +0100 |
commit | 8d90a63f99f686035c3a966ac687db6dd1b776b3 (patch) | |
tree | 08ad8f1db69c3e847850291b34d78bc9953152cb | |
parent | f48df26bb8e6e1cd2f7cc6c4cd4d7b254782ed2e (diff) | |
download | buildstream-8d90a63f99f686035c3a966ac687db6dd1b776b3.tar.gz |
_casbaseddirectory.py: Rename `ref` field to `__digest`
External access should use `_get_digest()`. This is in preparation for
lazy digest calculation.
-rw-r--r-- | buildstream/storage/_casbaseddirectory.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index 504b32080..f01600e14 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -262,7 +262,7 @@ class CasBasedDirectory(Directory): with open(self.cas_cache.objpath(digest), 'rb') as f: self.pb2_directory.ParseFromString(f.read()) - self.ref = digest + self.__digest = digest self.index = {} self.parent = parent self._directory_read = False @@ -289,7 +289,7 @@ class CasBasedDirectory(Directory): 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()) + self.__digest = self.cas_cache.add_object(buffer=self.pb2_directory.SerializeToString()) if self.parent: self.parent._recalculate_recursing_up(self) @@ -307,9 +307,9 @@ class CasBasedDirectory(Directory): subdir._recalculate_recursing_down(entry) if parent: - self.ref = self.cas_cache.add_object(digest=parent.digest, buffer=self.pb2_directory.SerializeToString()) + self.__digest = self.cas_cache.add_object(digest=parent.digest, buffer=self.pb2_directory.SerializeToString()) else: - self.ref = self.cas_cache.add_object(buffer=self.pb2_directory.SerializeToString()) + self.__digest = self.cas_cache.add_object(buffer=self.pb2_directory.SerializeToString()) # We don't need to do anything more than that; files were already added ealier, and symlinks are # part of the directory structure. @@ -820,9 +820,9 @@ class CasBasedDirectory(Directory): # (Digest): The Digest protobuf object for the Directory protobuf # def _get_digest(self): - if not self.ref: - self.ref = self.cas_cache.add_object(buffer=self.pb2_directory.SerializeToString()) - return self.ref + if not self.__digest: + self.__digest = self.cas_cache.add_object(buffer=self.pb2_directory.SerializeToString()) + return self.__digest def _objpath(self, path): subdir = self.descend(path[:-1]) |