diff options
author | Jürg Billeter <j@bitron.ch> | 2019-02-19 09:00:31 +0000 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2019-02-19 09:00:31 +0000 |
commit | cfbe409df6eb11b05ee8f0a9d2915ce4cdcd5689 (patch) | |
tree | 5f3a5abc6b8fbdf70824168d152c2bd32a5efab2 | |
parent | 5f0571d1932f8ea3effcfd0dd2f2c67c9e615d15 (diff) | |
parent | e2074693ff50ad03e7e2602a0bb9efd38dd9ac8e (diff) | |
download | buildstream-cfbe409df6eb11b05ee8f0a9d2915ce4cdcd5689.tar.gz |
Merge branch 'gokcennurlu/dont_cache_if_stage_fails' into 'master'
Prevent caching when Element.stage() fails
Closes #791
See merge request BuildStream/buildstream!1012
-rw-r--r-- | buildstream/element.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/buildstream/element.py b/buildstream/element.py index 8fc491204..ac1dec4ac 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -1620,12 +1620,12 @@ class Element(Plugin): self.__dynamic_public = _yaml.node_copy(self.__public) # Call the abstract plugin methods - try: - # Step 1 - Configure - self.__configure_sandbox(sandbox) - # Step 2 - Stage - self.stage(sandbox) + # Step 1 - Configure + self.__configure_sandbox(sandbox) + # Step 2 - Stage + self.stage(sandbox) + try: if self.__batch_prepare_assemble: cm = sandbox.batch(self.__batch_prepare_assemble_flags, collect=self.__batch_prepare_assemble_collect) |