zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed uninstall rm parent folder race condition (#21424)

Browse Source
This commit is contained in:
BenWeber42 2021-02-09 19:05:06 +01:00 committed by GitHub
parent b802e75274
commit e4d74825f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spack/spack/directory_layout.py
View File

@ -7,6 +7,7 @@
import shutil import shutil
import glob import glob
import tempfile import tempfile
import errno
from contextlib import contextmanager from contextlib import contextmanager
import ruamel.yaml as yaml import ruamel.yaml as yaml
@ -119,9 +120,17 @@ def remove_install_directory(self, spec, deprecated=False):
path = os.path.dirname(path) path = os.path.dirname(path)
while path != self.root: while path != self.root:
if os.path.isdir(path): if os.path.isdir(path):
if os.listdir(path): try:
return
os.rmdir(path) os.rmdir(path)
except OSError as e:
if e.errno == errno.ENOENT:
# already deleted, continue with parent
pass
elif e.errno == errno.ENOTEMPTY:
# directory wasn't empty, done
return
else:
raise e
path = os.path.dirname(path) path = os.path.dirname(path)