From owner-freebsd-python@FreeBSD.ORG  Wed Aug 13 22:33:19 2008
Return-Path: <owner-freebsd-python@FreeBSD.ORG>
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 9D143106566C
	for <python@FreeBSD.org>; Wed, 13 Aug 2008 22:33:19 +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 540018FC15
	for <python@FreeBSD.org>; Wed, 13 Aug 2008 22:33:19 +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-5672513;
	Wed, 13 Aug 2008 15:03:18 -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 1KTOR4-0002na-2S; Wed, 13 Aug 2008 15:03:18 -0700
Message-ID: <48A35A24.8040307@aero.org>
Date: Wed, 13 Aug 2008 15:03:16 -0700
From: Mark R Thomas <Mark.R.Thomas@aero.org>
User-Agent: Thunderbird 2.0.0.9 (Macintosh/20071031)
MIME-Version: 1.0
To: python@FreeBSD.org
Content-Type: multipart/mixed; boundary="------------090405090508020908000703"
Cc: Brooks Davis <brooks@aero.org>
Subject: FreeBSD Port: devel/py-setuptools
X-BeenThere: freebsd-python@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Mark R Thomas <Mark.R.Thomas@aero.org>
List-Id: FreeBSD-specific Python issues <freebsd-python.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>, 
	<mailto:freebsd-python-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-python>
List-Post: <mailto:freebsd-python@freebsd.org>
List-Help: <mailto:freebsd-python-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>,
	<mailto:freebsd-python-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Aug 2008 22:33:19 -0000

This is a multi-part message in MIME format.
--------------090405090508020908000703
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

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

--------------090405090508020908000703
Content-Type: text/plain;
 name="setuptools_patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="setuptools_patch.txt"

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

--------------090405090508020908000703--