diff options
| author | Jürg Billeter <j@bitron.ch> | 2019-02-27 11:13:55 +0100 |
|---|---|---|
| committer | Abderrahim Kitouni <akitouni@gnome.org> | 2020-08-26 12:47:05 +0100 |
| commit | f48df26bb8e6e1cd2f7cc6c4cd4d7b254782ed2e (patch) | |
| tree | 7190fa04ab13788bed1b4ea2510e564c27711bca | |
| parent | 234fd87f89128a0e71a3d4ddd73cd75101849b3b (diff) | |
| download | buildstream-f48df26bb8e6e1cd2f7cc6c4cd4d7b254782ed2e.tar.gz | |
_casbaseddirectory.py: Rename `ref` constructor parameter to `digest`
`ref` was misleading.
| -rw-r--r-- | buildstream/_artifactcache.py | 2 | ||||
| -rw-r--r-- | buildstream/storage/_casbaseddirectory.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/buildstream/_artifactcache.py b/buildstream/_artifactcache.py index a962aa76a..014c8f3cb 100644 --- a/buildstream/_artifactcache.py +++ b/buildstream/_artifactcache.py @@ -574,7 +574,7 @@ class ArtifactCache(): def get_artifact_directory(self, element, key): ref = element.get_artifact_name(key) digest = self.cas.resolve_ref(ref, update_mtime=True) - return CasBasedDirectory(self.cas, digest) + return CasBasedDirectory(self.cas, digest=digest) # commit(): # diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index 7e4e36a1a..504b32080 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -48,7 +48,7 @@ class IndexEntry(): def get_directory(self, parent): if not self.buildstream_object: - self.buildstream_object = CasBasedDirectory(parent.cas_cache, ref=self.pb_object.digest, + self.buildstream_object = CasBasedDirectory(parent.cas_cache, digest=self.pb_object.digest, parent=parent, filename=self.pb_object.name) return self.buildstream_object @@ -253,16 +253,16 @@ class CasBasedDirectory(Directory): _pb2_path_sep = "/" _pb2_absolute_path_prefix = "/" - def __init__(self, cas_cache, ref=None, parent=None, common_name="untitled", filename=None): + def __init__(self, cas_cache, *, digest=None, parent=None, common_name="untitled", filename=None): self.filename = filename self.common_name = common_name self.pb2_directory = remote_execution_pb2.Directory() self.cas_cache = cas_cache - if ref: - with open(self.cas_cache.objpath(ref), 'rb') as f: + if digest: + with open(self.cas_cache.objpath(digest), 'rb') as f: self.pb2_directory.ParseFromString(f.read()) - self.ref = ref + self.ref = digest self.index = {} self.parent = parent self._directory_read = False |