psi-jack/dotbot
1
0
Fork 0
mirror of synced 2024-11-22 08:15:34 -05:00
Code Issues Releases Wiki Activity

Resolve Windows-specific clean issues

Browse source
This commit is contained in:
Kurt McKee 2022-04-26 07:04:07 -05:00
parent 5b7db08e8a
commit a2846d0a61
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dotbot/plugins/clean.py
View file

@ -1,4 +1,6 @@
import os import os
import sys
import dotbot import dotbot
@ -42,7 +44,7 @@ class Clean(dotbot.Plugin):
self._log.debug("Ignoring nonexistent directory %s" % target) self._log.debug("Ignoring nonexistent directory %s" % target)
return True return True
for item in os.listdir(os.path.expandvars(os.path.expanduser(target))): for item in os.listdir(os.path.expandvars(os.path.expanduser(target))):
path = os.path.join(os.path.expandvars(os.path.expanduser(target)), item) path = os.path.abspath(os.path.join(os.path.expandvars(os.path.expanduser(target)), item))
if recursive and os.path.isdir(path): if recursive and os.path.isdir(path):
# isdir implies not islink -- we don't want to descend into # isdir implies not islink -- we don't want to descend into
# symlinked directories. okay to do a recursive call here # symlinked directories. okay to do a recursive call here
@ -50,6 +52,8 @@ class Clean(dotbot.Plugin):
self._clean(path, force, recursive) self._clean(path, force, recursive)
if not os.path.exists(path) and os.path.islink(path): if not os.path.exists(path) and os.path.islink(path):
points_at = os.path.join(os.path.dirname(path), os.readlink(path)) points_at = os.path.join(os.path.dirname(path), os.readlink(path))
if sys.platform[:5] == "win32" and points_at.startswith("\\\\?\\"):
points_at = points_at[4:]
if self._in_directory(path, self._context.base_directory()) or force: if self._in_directory(path, self._context.base_directory()) or force:
self._log.lowinfo("Removing invalid link %s -> %s" % (path, points_at)) self._log.lowinfo("Removing invalid link %s -> %s" % (path, points_at))
os.remove(path) os.remove(path)