summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarius Makovsky <traveltissues@protonmail.com>2019-07-18 18:01:10 +0100
committerDarius Makovsky <traveltissues@protonmail.com>2019-07-18 18:09:08 +0100
commit7ae56269b755509ccd1dc8ac43b05e2d653f8ac6 (patch)
tree12815b45d28dc36ce6aff52c2da6bded5d423e37
parent6d6ad3ded1e2996f057c5f2f1b0310e0f9f84b91 (diff)
downloadbuildstream-traveltissues/cache-key-changes-2.tar.gz
Reset cache data if a workspace build is pendingtraveltissues/cache-key-changes-2
This reverts one of the changes in https://gitlab.com/BuildStream/buildstream/commit/fa70a4299bc97b1f723a8602f6fad1bcc013f17a#11743b796594142e47df22054b99d263d52e28aa_1151_1152 and will be followed in a new issue.
-rw-r--r--src/buildstream/element.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 2f7db4166..97616ed14 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -1175,6 +1175,10 @@ class Element(Plugin):
# Tracking may still be pending
return
+ if self._get_workspace() and self.__assemble_scheduled:
+ self.__reset_cache_data()
+ return
+
self.__update_cache_keys()
self.__update_artifact_state()