Fixed directory clean.

1 files changed, 11 insertions, 16 deletions

diff --git a/java/config/IceGridAdmin.py b/java/config/IceGridAdmin.py
index ca245d04543..a2fbb8683c7 100644
--- a/java/config/IceGridAdmin.py
+++ b/java/config/IceGridAdmin.py
@@ -206,29 +206,24 @@ def listAdapters():
 
 def cleanDbDir(path):
     
-    try:
-        cleanServerDir(os.path.join(path, "node", "servers"))
-    except:
-        pass
-
-    try:
-        TestUtil.cleanDbDir(os.path.join(path, "node", "db"))
-    except:
-        pass
-
-    try:
-        TestUtil.cleanDbDir(os.path.join(path, "registry"))
-    except:
-        pass
+    files = os.listdir(path)
+    for filename in files:
+        if filename != "CVS" and filename != ".dummy":
+            fullpath = os.path.join(path, filename);
+            if os.path.isdir(fullpath):
+                cleanDir(fullpath)
+                os.rmdir(fullpath)
+            else:
+                os.remove(fullpath)
 
-def cleanServerDir(path):
+def cleanDir(path):
 
     files = os.listdir(path)
 
     for filename in files:
         fullpath = os.path.join(path, filename);
         if os.path.isdir(fullpath):
-            cleanServerDir(fullpath)
+            cleanDir(fullpath)
             os.rmdir(fullpath)
         else:
             os.remove(fullpath)