Hey all,
With Subversion 1.5 entering alpha, I've been using it for more than
just a few projects, and I've noticed that setuptools fails to run in
a 1.5 working copy. For the short term, I've found that I can just
modify the setuptools source to trust that version 9 WCs will work the
same as version 8 WCs. The diff for that is attached.
Based on what I've read of subversion's README on the format of the
entries file, the modification I've made should be just fine - the
overall structure of the file is the same, there's just some new tags
possible which will already not get stuck in the regex already in
place. In my local testing, using setuptools for installing files
works just fine with this patch in place.
Peace,
Augie Fackler
Index: setuptools/command/egg_info.py
===================================================================
--- setuptools/command/egg_info.py (revision 61076)
+++ setuptools/command/egg_info.py (working copy)
@@ -217,9 +217,9 @@
data = f.read()
f.close()
- if data.startswith('8'):
+ if data.startswith('8') or data.startswith('9'):
data = map(str.splitlines,data.split('\n\x0c\n'))
- del data[0][0] # get rid of the '8'
+ del data[0][0] # get rid of the '8' or '9'
dirurl = data[0][3]
localrev = max([int(d[9]) for d in data if len(d)>9 and
d[9]]+[0])
elif data.startswith('<?xml'):
Index: setuptools/command/sdist.py
===================================================================
--- setuptools/command/sdist.py (revision 61076)
+++ setuptools/command/sdist.py (working copy)
@@ -86,7 +86,7 @@
f = open(filename,'rU')
data = f.read()
f.close()
- if data.startswith('8'): # subversion 1.4
+ if data.startswith('8') or data.startswith('9'): # subversion 1.4 or 1.5
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
_______________________________________________
Distutils-SIG maillist - Distutils-SIG@python.org
http://mail.python.org/mailman/listinfo/distutils-sig
