[Python-checkins] r65015 - in sandbox/branches/setuptools-0.6: setuptools.txt setuptools/command/sdist.py

[phillip.eby]

Author: phillip.eby
Date: Wed Jul 16 15:58:49 2008
New Revision: 65015

Log:
Support subversion 1.5 (backport from trunk)


Modified:
   sandbox/branches/setuptools-0.6/setuptools.txt
   sandbox/branches/setuptools-0.6/setuptools/command/sdist.py

Modified: sandbox/branches/setuptools-0.6/setuptools.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools.txt	(original)
+++ sandbox/branches/setuptools-0.6/setuptools.txt	Wed Jul 16 15:58:49 2008
@@ -2631,6 +2631,8 @@
  * Added a warning if a namespace package is declared, but its parent package
    is not also declared as a namespace.
 
+ * Support Subversion 1.5
+
 0.6c7
  * Fixed ``distutils.filelist.findall()`` crashing on broken symlinks, and 
    ``egg_info`` command failing on new, uncommitted SVN directories.

Modified: sandbox/branches/setuptools-0.6/setuptools/command/sdist.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/sdist.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/sdist.py	Wed Jul 16 15:58:49 2008
@@ -86,7 +86,7 @@
     f = open(filename,'rU')
     data = f.read()
     f.close()
-    if data.startswith('8'):    # subversion 1.4
+    if data.startswith('9') or data.startswith('8'):    # subversion 1.5/1.4
         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
             if not record or len(record)>=6 and record[5]=="delete":
                 continue    # skip deleted