composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 08:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Retrofit from trunk

Browse Source 
Magic trick for windows. Sometimes the folder is empty but rmdir fails [from revision 5344]

SVN:2.4[5347]
This commit is contained in:
Eric Espié
2018-02-13 11:03:44 +00:00
parent caf07affa6
commit 028e815bfa
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

@@ -588,7 +588,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);
}
}
/**
@@ -611,7 +617,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
{