updates to the test harness. Fixed a bug with cleanDb in IceGridAdmin.py.

1 files changed, 7 insertions, 15 deletions

diff --git a/java/config/IceGridAdmin.py b/java/config/IceGridAdmin.py
index 72bb05d36d1..11e463a5e8c 100644
--- a/java/config/IceGridAdmin.py
+++ b/java/config/IceGridAdmin.py
@@ -232,20 +232,12 @@ def cleanDbDir(path):
         if filename != "CVS" and filename != ".dummy":
             fullpath = os.path.join(path, filename);
             if os.path.isdir(fullpath):
-                cleanDir(fullpath)
-                os.rmdir(fullpath)
+                cleanDbDir(fullpath)
+		try:
+		    os.rmdir(fullpath)
+		except OSError:
+		    # This might fail if the directory is empty (because it itself is
+		    # a CVS directory).
+		    pass
             else:
                 os.remove(fullpath)
-
-def cleanDir(path):
-
-    files = os.listdir(path)
-
-    for filename in files:
-        fullpath = os.path.join(path, filename);
-        if os.path.isdir(fullpath):
-            cleanDir(fullpath)
-            os.rmdir(fullpath)
-        else:
-            os.remove(fullpath)
-