Fixed bug with TestUtil.cleanDbDir and IceGridAdmin.cleanDbDir.

Added back accidently erased .gitignore files.
Added clean rules to IceGrid demo Makefiles.

1 files changed, 11 insertions, 15 deletions

diff --git a/java/config/IceGridAdmin.py b/java/config/IceGridAdmin.py
index 35cf3735eee..b4b47cc4bcb 100644
--- a/java/config/IceGridAdmin.py
+++ b/java/config/IceGridAdmin.py
@@ -261,18 +261,14 @@ def iceGridClientServerTest(name, additionalClientOptions, additionalServerOptio
         sys.exit(1)
 
 def cleanDbDir(path):
-    
-    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):
-                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)
+    for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore"]:
+        if os.path.isdir(filename):
+            cleanDbDir(filename)
+            try:
+                os.rmdir(filename)
+            except OSError:
+                # This might fail if the directory is empty (because
+                # it itself contains a .gitignore file.
+                pass
+        else:
+            os.remove(filename)