summaryrefslogtreecommitdiff
path: root/buildstream
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2018-09-28 17:52:01 +0100
committerJonathan Maw <jonathan.maw@codethink.co.uk>2018-10-30 15:42:05 +0000
commit09ef8b254342638e828378c2f785963bcf9487da (patch)
tree4132093d332c34110e5725fe27527a73d41798cf /buildstream
parentbaf6b57823dd49565d7c39ca33d07949e97ccaf2 (diff)
downloadbuildstream-09ef8b254342638e828378c2f785963bcf9487da.tar.gz
element.py: Always clean up the rootdir
We shouldn't need it to persist now that we cache failed build dirs. This change breaks the test `tests/integration/shell.py::test_sysroot_workspace_visible`. I can no longer see a use-case for this test. AIUI, it tested that the failed build sysroot stored in the builddir has the workspace's files in, despite the workspace being unmounted. I believe this behaviour is made redundant by cached buildtrees. This fixes part of #539
Diffstat (limited to 'buildstream')
-rw-r--r--buildstream/element.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/element.py b/buildstream/element.py
index 4d3e1bc75..848730529 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -1683,8 +1683,8 @@ class Element(Plugin):
"unable to collect artifact contents"
.format(collect))
- # Finally cleanup the build dir
- cleanup_rootdir()
+ # Finally cleanup the build dir
+ cleanup_rootdir()
return artifact_size