Skip to content

Fix removal of symlinked directories #1744

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

Merged
deathaxe merged 1 commit into from
May 19, 2026
Merged

Fix removal of symlinked directories #1744

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
15 changes: 10 additions & 5 deletions package_control/clear_directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ def clear_directory(directory, ignored_files=None, ignore_errors=True):
except EnvironmentError:
pass
os.remove(path)

except OSError:
trash_path = os.path.join(
trash_dir,
Expand All @@ -82,12 +81,18 @@ def clear_directory(directory, ignored_files=None, ignore_errors=True):
os.rename(path, trash_path)

for d in dirs:
path = os.path.join(root, d)
try:
os.rmdir(os.path.join(root, d))
if IS_WIN or not os.path.islink(path):
os.rmdir(path)
else:
os.unlink(path)
except FileNotFoundError:
pass
except OSError as e:
if e.errno == errno.ENOTEMPTY:
continue
raise
if e.errno != errno.ENOTEMPTY:
raise
was_exception = True

except OSError:
if not ignore_errors:
Expand Down
Loading