Date: Wed, 13 Aug 2008 15:22:55 -0700 From: Mark R Thomas <Mark.R.Thomas@aero.org> To: Mark R Thomas <Mark.R.Thomas@aero.org> Cc: Brooks Davis <brooks@aero.org>, python@FreeBSD.org Subject: Re: FreeBSD Port: devel/py-setuptools Message-ID: <48A35EBF.1050209@aero.org> In-Reply-To: <48A35A24.8040307@aero.org> References: <48A35A24.8040307@aero.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------020200050904040301060007 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit I've attached two patch files I just tested successfully with the ports system. Drop these into a "files" subdirectory in the the py-setuptools port and this should work just fine. Mark Mark Thomas wrote: > Hi, > > Setuptools fails with subversion 1.5 installed due to an inability to > parse the new subversion working copy file format. > > The issue is tracked both here: > http://bugs.python.org/setuptools/issue4 > and here: > http://bugs.python.org/issue2770 > > Though the issue appears to be resolved in the development branch of > setuptools, if the FreeBSD port intends to remain behind this, we should > apply the attached patch (available from the second link above as well). > > Thanks! > Mark Thomas > The Aerospace Corporation > El Segundo, CA > --------------020200050904040301060007 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="patch-setuptools-command-egg_info.py" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-setuptools-command-egg_info.py" 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'): --------------020200050904040301060007 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="patch-setuptools-command-sdist.py" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-setuptools-command-sdist.py" 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 --------------020200050904040301060007--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?48A35EBF.1050209>