summaryrefslogtreecommitdiff
path: root/buildstream/element.py
diff options
context:
space:
mode:
authorTristan Maat <tristan.maat@codethink.co.uk>2017-09-28 13:20:33 +0100
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-10-13 15:57:40 +0900
commita968bab76201856a67c876be25745fee912c136b (patch)
tree72f3de7bf7da88de4d2542a2ad26c1c19b26c5a0 /buildstream/element.py
parenta580a4a032c2e492c5287a976ced1db178467549 (diff)
downloadbuildstream-a968bab76201856a67c876be25745fee912c136b.tar.gz
Ensure that artifact file permissions are set in the right order
Diffstat (limited to 'buildstream/element.py')
-rw-r--r--buildstream/element.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/element.py b/buildstream/element.py
index e3e9a4b34..a956246d9 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -1040,7 +1040,7 @@ class Element(Plugin):
# Cleanup the build directory on explicit SIGTERM
def cleanup_rootdir():
- shutil.rmtree(rootdir)
+ utils._force_rmtree(rootdir)
with _signals.terminator(cleanup_rootdir), \
self.__sandbox(rootdir, output_file, output_file) as sandbox: # nopep8
@@ -1116,7 +1116,7 @@ class Element(Plugin):
self.__artifacts.commit(self, assembledir)
# Finally cleanup the build dir
- shutil.rmtree(rootdir)
+ cleanup_rootdir()
# _pull():
#
@@ -1415,7 +1415,7 @@ class Element(Plugin):
yield sandbox
# Cleanup the build dir
- shutil.rmtree(rootdir)
+ utils._force_rmtree(rootdir)
def __compose_default_splits(self, defaults):
project = self.get_project()