[buildstream] branch bst-1 updated: sandbox/_sandboxbwrap.py: don't try to delete symlinks as directories

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch bst-1
in repository https://gitbox.apache.org/repos/asf/buildstream.git


The following commit(s) were added to refs/heads/bst-1 by this push:
     new f0d7f9f  sandbox/_sandboxbwrap.py: don't try to delete symlinks as directories
     new 60c871a  Merge pull request #1563 from abderrahim/dev-shm
f0d7f9f is described below

commit f0d7f9f132a2180c80e70196d340bd5f6d78c099
Author: Abderrahim Kitouni <ak...@gnome.org>
AuthorDate: Fri Jan 14 09:04:18 2022 +0100

    sandbox/_sandboxbwrap.py: don't try to delete symlinks as directories
    
    This prevents breaking projects that have workarounds for /dev/shm support
---
 buildstream/sandbox/_sandboxbwrap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildstream/sandbox/_sandboxbwrap.py b/buildstream/sandbox/_sandboxbwrap.py
index 291fce1..2352843 100644
--- a/buildstream/sandbox/_sandboxbwrap.py
+++ b/buildstream/sandbox/_sandboxbwrap.py
@@ -201,7 +201,7 @@ class SandboxBwrap(Sandbox):
         # there just in case so that we can safely cleanup the debris.
         #
         existing_basedirs = {
-            directory: os.path.exists(os.path.join(root_directory, directory))
+            directory: os.path.lexists(os.path.join(root_directory, directory))
             for directory in ['dev/shm', 'tmp', 'dev', 'proc']
         }