composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Magic trick for windows. Sometimes the folder is empty but rmdir fails

Browse Source 
SVN:trunk[5344]
This commit is contained in:
Eric Espié
2018-02-13 10:59:56 +00:00
parent 19665d4ad9
commit 894f1c4f28
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
setup/setuputils.class.inc.php
View File

@@ -589,7 +589,13 @@ class SetupUtils
throw new Exception("Attempting to delete directory: '$dir'");
}
self::tidydir($dir);
rmdir($dir);
if (@rmdir($dir) === false)
{
// Magic trick for windows
// sometimes the folder is empty but rmdir fails
closedir(opendir($dir));
@rmdir($dir);
}
}
/**
@@ -614,7 +620,13 @@ class SetupUtils
if(is_dir($dir.'/'.$file))
{
self::tidydir($dir.'/'.$file);
rmdir($dir.'/'.$file);
if (@rmdir($dir.'/'.$file) === false)
{
// Magic trick for windows
// sometimes the folder is empty but rmdir fails
closedir(opendir($dir.'/'.$file));
@rmdir($dir.'/'.$file);
}
}
else
{