Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

storage/reflink: let _remove_empty_dir() ignore ENOTEMPTY

Browse Source
This commit is contained in:
Rusty Bird 2018-03-11 15:34:58 +00:00
parent 023cb49293
commit c382eb3752
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/storage/reflink.py
View File

@ -140,12 +140,7 @@ class ReflinkVolume(qubes.storage.Volume):
self._prune_revisions(keep=0) self._prune_revisions(keep=0)
_remove_file(self._path_clean) _remove_file(self._path_clean)
_remove_file(self._path_dirty) _remove_file(self._path_dirty)
_remove_empty_dir(os.path.dirname(self._path_dirty))
try:
_remove_empty_dir(os.path.dirname(self._path_dirty))
except OSError as ex:
if ex.errno is not errno.ENOTEMPTY:
raise
return self return self
@ -360,10 +355,13 @@ def _remove_file(path):
LOGGER.info('Removed file: %s', path) LOGGER.info('Removed file: %s', path)
def _remove_empty_dir(path): def _remove_empty_dir(path):
with suppress(FileNotFoundError): try:
os.rmdir(path) os.rmdir(path)
_fsync_dir(os.path.dirname(path)) _fsync_dir(os.path.dirname(path))
LOGGER.info('Removed empty directory: %s', path) LOGGER.info('Removed empty directory: %s', path)
except OSError as ex:
if ex.errno not in (errno.ENOENT, errno.ENOTEMPTY):
raise
def _rename_file(src, dst): def _rename_file(src, dst):
os.rename(src, dst) os.rename(src, dst)