From ab3fc89698a19a5d34d610b81c478fa3462b07be Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Sat, 6 Dec 2014 10:39:51 +0000
Subject: [PATCH]  * When the removal of a directory fails during a recursive  
  SysDeleteTree, wait 5 seconds and retry twice. Hopefully this solves bug
 #21868

git-svn-id: trunk@29206 -
---
 packages/fpmkunit/src/fpmkunit.pp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/fpmkunit/src/fpmkunit.pp b/packages/fpmkunit/src/fpmkunit.pp
index 199fd35de4..1002e5fbfa 100644
--- a/packages/fpmkunit/src/fpmkunit.pp
+++ b/packages/fpmkunit/src/fpmkunit.pp
@@ -1526,6 +1526,7 @@ ResourceString
   SWarngccNotFound        = 'Could not find libgcc';
   SWarngcclibpath         = 'Warning: Unable to determine the libgcc path.';
   SWarnNoFCLProcessSupport= 'No FCL-Process support';
+  SWarnRetryRemDirectory     = 'Failed to remove directory "%s". Retry after a short delay';
 
   SInfoPackageAlreadyProcessed = 'Package %s is already processed';
   SInfoCompilingTarget    = 'Compiling target %s';
@@ -5049,6 +5050,7 @@ procedure TBuildEngine.SysDeleteTree(Const ADirectoryName: String);
     searchRec: TSearchRec;
     SearchResult: longint;
     s: string;
+    i: integer;
   begin
     result := true;
     SearchResult := FindFirst(IncludeTrailingPathDelimiter(ADirectoryName)+AllFilesMask, faAnyFile+faSymLink, searchRec);
@@ -5073,9 +5075,21 @@ procedure TBuildEngine.SysDeleteTree(Const ADirectoryName: String);
     finally
       FindClose(searchRec);
     end;
-    if not RemoveDir(ADirectoryName) then
-      result := false
-    else
+
+    // There were reports of RemoveDir failing due to locking-problems. To solve
+    // these the RemoveDir is tried three times, with a delay of 5 seconds. See
+    // bug 21868
+    i := 2;
+    result := RemoveDir(ADirectoryName+'te');
+    while not result and (i>0) do
+      begin
+        log(vlWarning, SWarnRetryRemDirectory, [ADirectoryName]);
+        sleep(5000);
+        dec(i);
+        result := RemoveDir(ADirectoryName+'fd');
+      end;
+
+    if result then
       log(vldebug, SDbgRemovedDirectory, [ADirectoryName]);
   end;