summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin David <valentin.david@gmail.com>2018-08-13 15:25:42 +0000
committerValentin David <valentin.david@gmail.com>2018-08-13 15:25:42 +0000
commit6a2f3b59b0ec99a89e46e6dd12f13ef4de0d8a88 (patch)
tree53ecda908d805b6581dbb21f800845621645b48e
parent01850d558c58bd55ee15733ceecf41696d332666 (diff)
parent064abe66210d1a212c233168b4ab8aa11b61d92b (diff)
downloadbuildstream-6a2f3b59b0ec99a89e46e6dd12f13ef4de0d8a88.tar.gz
Merge branch 'valentindavid/fix-debug-crash-1.2' into 'bst-1.2'
Fix crash when --debug is passed See merge request BuildStream/buildstream!648
-rw-r--r--buildstream/element.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/buildstream/element.py b/buildstream/element.py
index e7c90de46..ffdead527 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -194,6 +194,9 @@ class Element(Plugin):
def __init__(self, context, project, artifacts, meta, plugin_conf):
+ self.__cache_key_dict = None # Dict for cache key calculation
+ self.__cache_key = None # Our cached cache key
+
super().__init__(meta.name, context, project, meta.provenance, "element")
self.__is_junction = meta.kind == "junction"
@@ -212,8 +215,6 @@ class Element(Plugin):
self.__runtime_dependencies = [] # Direct runtime dependency Elements
self.__build_dependencies = [] # Direct build dependency Elements
self.__sources = [] # List of Sources
- self.__cache_key_dict = None # Dict for cache key calculation
- self.__cache_key = None # Our cached cache key
self.__weak_cache_key = None # Our cached weak cache key
self.__strict_cache_key = None # Our cached cache key for strict builds
self.__artifacts = artifacts # Artifact cache