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

[phillip.eby]

Author: phillip.eby
Date: Tue Sep 26 18:21:25 2006
New Revision: 52007

Modified:
   sandbox/branches/setuptools-0.6/setuptools.txt
   sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py
Log:
Handle empty revision numbers in SVN 1.4 "entries" format
(backport from trunk)


Modified: sandbox/branches/setuptools-0.6/setuptools.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools.txt	(original)
+++ sandbox/branches/setuptools-0.6/setuptools.txt	Tue Sep 26 18:21:25 2006
@@ -2610,6 +2610,8 @@
    installer on Unix, without doing multiple downloads, dealing with firewalls,
    etc.)
 
+ * Fix problem with empty revision numbers in Subversion 1.4 ``entries`` files
+
 0.6c3
  * Fixed breakages caused by Subversion 1.4's new "working copy" format
 

Modified: sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py	Tue Sep 26 18:21:25 2006
@@ -221,7 +221,7 @@
                 data = map(str.splitlines,data.split('\n\x0c\n'))
                 del data[0][0]  # get rid of the '8'
                 dirurl = data[0][3]
-                localrev = max([int(d[9]) for d in data if len(d)>9])
+                localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]])
             elif data.startswith('<?xml'):
                 dirurl = urlre.search(data).group(1)    # get repository URL
                 localrev = max([int(m.group(1)) for m in revre.finditer(data)])