daca2: improved cleanup

tools/daca2.py

@@ -31,12 +31,37 @@ def handleRemoveReadonly(func, path, exc):
         raise
 
 def removeAllExceptResults():
-    filenames = glob.glob('[A-Za-z]*')
+    count = 5
-    for filename in filenames:
+    while count > 0:
-        if os.path.isdir(filename):
+        count = count - 1
-            shutil.rmtree(filename, onerror=handleRemoveReadonly)
+
-        elif filename != 'results.txt':
+        filenames = []
-            os.remove(filename)
+        for g in glob.glob('[A-Za-z0-9]*'):
+            filenames.append(g)
+        for g in glob.glob('.[a-z]*'):
+            filenames.append(g)
+
+        try:
+            for filename in filenames:
+                if os.path.isdir(filename):
+                    shutil.rmtree(filename, onerror=handleRemoveReadonly)
+                elif filename != 'results.txt':
+                    os.remove(filename)
+        except WindowsError, err:
+            time.sleep(30)
+            if count == 0:
+                print('Failed to cleanup files/folders')
+                print(err)
+                sys.exit(1)
+            continue
+        except OSError, err:
+            time.sleep(30)
+            if count == 0:
+                print('Failed to cleanup files/folders')
+                print(err)
+                sys.exit(1)
+            continue
+        count = 0
 
 
 def scanarchive(fullpath):