From 894f1c4f28a554981c38bf069afb58f679838e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Feb 2018 10:59:56 +0000
Subject: [PATCH] Magic trick for windows. Sometimes the folder is empty but
 rmdir fails

SVN:trunk[5344]
---
 setup/setuputils.class.inc.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index 2ecefc38a..944020d0c 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -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
 					{