[Zope-Checkins] SVN: Zope/trunk/ Don't copy '.svn' directories from skeleton into an instance.

[Tres Seaver]

Log message for revision 30343:
  Don't copy '.svn' directories from skeleton into an instance.
  
  (Thanks to Dale Hirt for the patch).
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/utilities/copyzopeskel.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-05-12 18:32:06 UTC (rev 30342)
+++ Zope/trunk/doc/CHANGES.txt	2005-05-12 20:06:15 UTC (rev 30343)
@@ -31,6 +31,9 @@
 
     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

Modified: Zope/trunk/utilities/copyzopeskel.py
===================================================================
--- Zope/trunk/utilities/copyzopeskel.py	2005-05-12 18:32:06 UTC (rev 30342)
+++ Zope/trunk/utilities/copyzopeskel.py	2005-05-12 20:06:15 UTC (rev 30343)
@@ -186,12 +186,12 @@
         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: