Directory deletion no longer recurses into symlinks

This commit is contained in:
Cyberboss
2017-09-24 15:14:35 -04:00
parent 8951c8746f
commit 88dde25e6d
2 changed files with 5 additions and 14 deletions
-13
View File
@@ -141,22 +141,9 @@ namespace TGServerService
if (Directory.Exists(Path.Combine(GameDirA, InterfaceDLLName)))
Directory.Delete(Path.Combine(GameDirA, InterfaceDLLName));
var Config = LoadRepoConfig();
if (Config != null)
{
CleanGameFolderList(GameDirA, Config.StaticDirectoryPaths);
CleanGameFolderList(GameDirA, Config.DLLPaths);
}
if (Directory.Exists(Path.Combine(GameDirB, InterfaceDLLName)))
Directory.Delete(Path.Combine(GameDirB, InterfaceDLLName));
if (Config != null)
{
CleanGameFolderList(GameDirB, Config.StaticDirectoryPaths);
CleanGameFolderList(GameDirB, Config.DLLPaths);
}
if (Directory.Exists(GameDirLive))
Directory.Delete(GameDirLive);
}
+5 -1
View File
@@ -30,7 +30,11 @@ namespace TGServerService
if (excludeRoot != null)
for (var I = 0; I < excludeRoot.Count; ++I)
excludeRoot[I] = excludeRoot[I].ToLower();
if (!di.Attributes.HasFlag(FileAttributes.Directory))
{ //this is probably a symlink
Directory.Delete(di.FullName);
return;
}
NormalizeAndDelete(di, excludeRoot);
if (!ContentsOnly)
{