Don't copy '.svn' directories from skeleton into an instance.

(Thanks to Dale Hirt for the patch).

doc/CHANGES.txt

@@ -31,6 +31,9 @@ Zope Changes
 
     Bugs fixed
 
+      - Don't copy '.svn' directories from skeleton into an instance
+        (thanks to Dale Hirt for the patch).
+
       - Collector #1776: Improved setup.py.
         The Finder class is now used for the complete lib/python tree and has
         a blacklist instead of a whitelist for file extensions. So there

utilities/copyzopeskel.py

@@ -186,12 +186,12 @@ def copyskel(sourcedir, targetdir, uid, gid, **replacements):
         print >>sys.stderr, msg
         sys.exit(1)
 
-CVS = os.path.normcase("CVS")
+CVS_DIRS = [os.path.normcase("CVS"), os.path.normcase(".svn")]
 
 def copydir((targetdir, replacements, uid, gid), sourcedir, names):
     # Don't recurse into CVS directories:
     for name in names[:]:
-        if os.path.normcase(name) == CVS:
+        if os.path.normcase(name) in CVS_DIRS:
             names.remove(name)
         elif os.path.isfile(os.path.join(sourcedir, name)):
             # Copy the file: