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

N°1488 - restore failed on production-modules

Browse Source 
SVN:2.4[5827]
This commit is contained in:
Eric Espié
2018-06-05 13:48:56 +00:00
parent ba33b01d84
commit 3169b39952
4 changed files with 101 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -588,13 +588,7 @@ class SetupUtils
throw new Exception("Attempting to delete directory: '$dir'");
}
self::tidydir($dir);
if (@rmdir($dir) === false)
{
// Magic trick for windows
// sometimes the folder is empty but rmdir fails
closedir(opendir($dir));
@rmdir($dir);
}
self::rmdir_safe($dir);
}
/**
@@ -617,13 +611,7 @@ class SetupUtils
if(is_dir($dir.'/'.$file))
{
self::tidydir($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);
}
self::rmdir_safe($dir.'/'.$file);
}
else
{
@@ -657,6 +645,24 @@ class SetupUtils
}
}
public static function rmdir_safe($dir)
{
// avoid unnecessary warning
// Try 100 times...
$i = 100;
while ((@rmdir($dir) === false) && $i > 0)
{
// Magic trick for windows
// sometimes the folder is empty but rmdir fails
closedir(opendir($dir));
$i--;
}
if ($i == 0)
{
rmdir($dir);
}
}
/**
* Helper to copy a directory to a target directory, skipping .SVN files (for developer's comfort!)
* Returns true if successfull
@@ -768,14 +774,14 @@ class SetupUtils
self::tidydir($sSource);
if($bRemoveSource === true)
{
rmdir($sSource);
self::rmdir_safe($sSource);
}
/**
* We have tried the following implementation (based on a rename/mv)
* But this does not work on some OSes.
* More info: https://bugs.php.net/bug.php?id=54097
*
* More info: https://bugs.php.net/bug.php?id=54097
*
$aFiles = scandir($sSource);
if(sizeof($aFiles) > 0)
{