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-22 16:45:27 +0100
commit528988a2b30ea4ae6ff3d0f58c4a3c43094b5981 (patch)
tree91394a498715b415adb714fdd419e6400881ebb2
parent8a935d53c97af7ccabbecad201c7143311996895 (diff)
downloadbuildstream-528988a2b30ea4ae6ff3d0f58c4a3c43094b5981.tar.gz
Reset cache data if a workspace build is pending
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 d076e8799..396a72fb2 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()