diff options
| author | Tom Pollard <tom.pollard@codethink.co.uk> | 2019-04-29 17:12:23 +0100 |
|---|---|---|
| committer | Tom Pollard <tom.pollard@codethink.co.uk> | 2019-04-29 17:12:23 +0100 |
| commit | f424ad1d857b1c1c79adb0e6823534f1786398ca (patch) | |
| tree | ab17ab3d5af6e7c07e9b3adce17d832d877d7c89 | |
| parent | 6e8c9bcfe2b0afae97264358908852886fc27140 (diff) | |
| download | buildstream-tpollard/prototemp.tar.gz | |
Move back to using artifact method for proto in pushtpollard/prototemp
| -rw-r--r-- | buildstream/_artifactcache.py | 2 | ||||
| -rw-r--r-- | buildstream/element.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/buildstream/_artifactcache.py b/buildstream/_artifactcache.py index 5df380457..4d074c29d 100644 --- a/buildstream/_artifactcache.py +++ b/buildstream/_artifactcache.py @@ -542,7 +542,7 @@ class ArtifactCache(BaseCache): keys = list(keys) if not keys: keys = [element._get_cache_key()] - artifacts = list(map(self.get_artifact_proto, list(map(element.get_artifact_name, keys)))) + artifacts = list(map(element.get_artifact_proto, keys)) # check the artifacts are the same for each key # unsure how necessary this is artifact = artifacts[0] diff --git a/buildstream/element.py b/buildstream/element.py index ba8e93d88..0f4560642 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -455,6 +455,9 @@ class Element(Plugin): yield from visit(self, scope, visited) + def get_artifact_proto(self, key): + return self.__artifact._get_proto() + def search(self, scope, name): """Search for a dependency by name |