aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-09-26 16:21:25 +0000
committerPJ Eby <distutils-sig@python.org>2006-09-26 16:21:25 +0000
commite420a145ffc5db10b32a54584c7ba92d83a59b8a (patch)
treee96e30eba4f187a0508b2fcdb6350be6ff2588e6
parent2c5978d3bb4f91f7f837e974c4abdc8248ed8d3f (diff)
downloadexternal_python_setuptools-e420a145ffc5db10b32a54584c7ba92d83a59b8a.tar.gz
external_python_setuptools-e420a145ffc5db10b32a54584c7ba92d83a59b8a.tar.bz2
external_python_setuptools-e420a145ffc5db10b32a54584c7ba92d83a59b8a.zip
Handle empty revision numbers in SVN 1.4 "entries" format
(backport from trunk) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4052007
-rwxr-xr-xsetuptools.txt2
-rwxr-xr-xsetuptools/command/egg_info.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/setuptools.txt b/setuptools.txt
index 26874c88..68588d7f 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -2610,6 +2610,8 @@ Release Notes/Change History
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
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index eb7aeae2..1223385f 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -221,7 +221,7 @@ class egg_info(Command):
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)])