From owner-freebsd-python@FreeBSD.ORG Wed Aug 13 22:25:46 2008 Return-Path: Delivered-To: python@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE6DD1065680 for ; Wed, 13 Aug 2008 22:25:46 +0000 (UTC) (envelope-from Mark.R.Thomas@aero.org) Received: from mhbackup.aero.org (mhbackup.aero.org [130.221.88.105]) by mx1.freebsd.org (Postfix) with ESMTP id 856CB8FC1D for ; Wed, 13 Aug 2008 22:25:46 +0000 (UTC) (envelope-from Mark.R.Thomas@aero.org) Received: from happy.face.aero.org (ns.face.aero.org [130.221.31.116]) by mhbackup.aero.org with ESMTPS id BT-MMP-5685319; Wed, 13 Aug 2008 15:22:56 -0700 Received: from vpn-west-22-6.aero.org ([130.221.22.6] helo=s231-109.resnet.ucla.edu) by happy.face.aero.org with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.50) id 1KTOk4-0002q1-KP; Wed, 13 Aug 2008 15:22:56 -0700 Message-ID: <48A35EBF.1050209@aero.org> Date: Wed, 13 Aug 2008 15:22:55 -0700 From: Mark R Thomas User-Agent: Thunderbird 2.0.0.9 (Macintosh/20071031) MIME-Version: 1.0 To: Mark R Thomas References: <48A35A24.8040307@aero.org> In-Reply-To: <48A35A24.8040307@aero.org> Content-Type: multipart/mixed; boundary="------------020200050904040301060007" Cc: Brooks Davis , python@FreeBSD.org Subject: Re: FreeBSD Port: devel/py-setuptools X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Mark R Thomas List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Aug 2008 22:25:46 -0000 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('=6 and record[5]=="delete": continue # skip deleted --------------020200050904040301060007--