Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check path for hassyspath and use shutil.rmdir if True #429

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check path for hassyspath and use shutil.rmdir if True #429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions fs/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import hashlib
import itertools
import os
import shutil
import threading
import time
import typing
Expand Down Expand Up @@ -1219,17 +1220,20 @@ def removetree(self, dir_path):
dir_path (str): Path to a directory on the filesystem.

"""
_dir_path = abspath(normpath(dir_path))
with self._lock:
walker = walk.Walker(search="depth")
gen_info = walker.info(self, _dir_path)
for _path, info in gen_info:
if info.is_dir:
self.removedir(_path)
else:
self.remove(_path)
if _dir_path != "/":
self.removedir(dir_path)
if self.hassyspath(path):
shutil.rmtree(self.getsyspath(path))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shutil.rmtree can potentially raise OSError, we would want to wrap it using the onerror callback, probably turning it into an fs.errors.OperationFailed.

else:
_dir_path = abspath(normpath(dir_path))
walker = walk.Walker(search="depth")
gen_info = walker.info(self, _dir_path)
for _path, info in gen_info:
if info.is_dir:
self.removedir(_path)
else:
self.remove(_path)
if _dir_path != "/":
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you also need to check that _dir_path is not "/" with the shutil.rmtree branch too, otherwise you may end up deleting the root of the filesystem and potentially preventing new files/directories from being created in that filesystem afterwards.

self.removedir(dir_path)

def scandir(
self,
Expand Down