Merge branch 'jmac/make_writable_combination' into 'master'

Use _force_rmtree instead of custom code.

Closes #735

See merge request BuildStream/buildstream!927

1 files changed, 3 insertions, 10 deletions

diff --git a/buildstream/element.py b/buildstream/element.py
index 8ec06090c..31ca5d307 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -1410,16 +1410,9 @@ class Element(Plugin):
 
             finally:
                 # Staging may produce directories with less than 'rwx' permissions
-                # for the owner, which will break tempfile, so we need to use chmod
-                # occasionally.
-                def make_dir_writable(fn, path, excinfo):
-                    os.chmod(os.path.dirname(path), 0o777)
-                    if os.path.isdir(path):
-                        os.rmdir(path)
-                    else:
-                        os.remove(path)
-                shutil.rmtree(temp_staging_directory, onerror=make_dir_writable)
-
+                # for the owner, which breaks tempfile. _force_rmtree will deal
+                # with these.
+                utils._force_rmtree(temp_staging_directory)
         # Ensure deterministic mtime of sources at build time
         vdirectory.set_deterministic_mtime()
         # Ensure deterministic owners of sources at build time