summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2017-06-30 17:13:20 +0200
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-07-05 20:32:20 +0900
commit0c94ff6024f39f837d3affed988f2dfbe114e24e (patch)
tree6d1e135c4dacddae77860b577b2cdf54a4fedfaf
parent2f0a6491a08d60a8e293321b9848e37aae45fd92 (diff)
downloadbuildstream-0c94ff6024f39f837d3affed988f2dfbe114e24e.tar.gz
element.py: Include static public data for cache key generation
This will be required when public data will be stored in the artifact cache in preparation for dynamic public data support.
-rw-r--r--buildstream/element.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/buildstream/element.py b/buildstream/element.py
index 458d97244..f9a6ff7e0 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -706,18 +706,6 @@ class Element(Plugin):
if key not in self.__env_nocache
}
- # Integration commands imposed on depending elements do not effect
- # a given element's cache key, the sum of an element's dependency
- # integration commands however does effect the cache key.
- integration = [
- {
- 'elt': e.name,
- 'commands': e.get_public_data('bst').get('integration-commands', [])
- }
- for e in self.dependencies(Scope.BUILD)
- if e.get_public_data('bst') is not None
- ]
-
context = self.get_context()
project = self.get_project()
self.__cache_key = utils._generate_key({
@@ -727,7 +715,7 @@ class Element(Plugin):
'environment': cache_env,
'sources': [s.get_unique_key() for s in self.__sources],
'dependencies': dependencies,
- 'integration': integration
+ 'public': self.__public
})
return self.__cache_key