Return-Path: 
 <commits-return-678-apmail-avro-commits-archive=avro.apache.org@avro.apache.org>
Delivered-To: apmail-avro-commits-archive@www.apache.org
Received: (qmail 92192 invoked from network); 2 Sep 2010 23:04:06 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 2 Sep 2010 23:04:06 -0000
Received: (qmail 48003 invoked by uid 500); 2 Sep 2010 23:04:06 -0000
Delivered-To: apmail-avro-commits-archive@avro.apache.org
Received: (qmail 47986 invoked by uid 500); 2 Sep 2010 23:04:05 -0000
Mailing-List: contact commits-help@avro.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@avro.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@avro.apache.org>
List-Post: <mailto:commits@avro.apache.org>
List-Id: <commits.avro.apache.org>
Reply-To: dev@avro.apache.org
Delivered-To: mailing list commits@avro.apache.org
Received: (qmail 47978 invoked by uid 99); 2 Sep 2010 23:04:05 -0000
Received: from Unknown (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 23:04:05 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 23:03:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 19ADB23889E0; Thu,  2 Sep 2010 23:03:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r992147 - in /avro/branches/branch-1.4: ./ CHANGES.txt
 lang/py/build.xml
Date: Thu, 02 Sep 2010 23:03:27 -0000
To: commits@avro.apache.org
From: cutting@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100902230327.19ADB23889E0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cutting
Date: Thu Sep  2 23:03:26 2010
New Revision: 992147

URL: http://svn.apache.org/viewvc?rev=992147&view=rev
Log:
Merge r992146 from trunk to 1.4 branch.  Fixes AVRO-653.

Modified:
    avro/branches/branch-1.4/   (props changed)
    avro/branches/branch-1.4/CHANGES.txt
    avro/branches/branch-1.4/lang/py/build.xml

Propchange: avro/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  2 23:03:26 2010
@@ -1 +1 @@
-/avro/trunk:990852,990860,990867,990871,990878,991031,991423
+/avro/trunk:990852,990860,990867,990871,990878,991031,991423,992146

Modified: avro/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/CHANGES.txt?rev=992147&r1=992146&r2=992147&view=diff
==============================================================================
--- avro/branches/branch-1.4/CHANGES.txt (original)
+++ avro/branches/branch-1.4/CHANGES.txt Thu Sep  2 23:03:26 2010
@@ -214,6 +214,9 @@ Avro 1.4.0 (31 August 2010)
 
     AVRO-640. Python: Fix path to sources in RPC interop test.  (cutting)
 
+    AVRO-653. Python: Fix so distribution contains correct files.
+    (Eric Evans via cutting)
+
 Avro 1.3.3 (7 June 2010)
 
   IMPROVEMENTS

Modified: avro/branches/branch-1.4/lang/py/build.xml
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/lang/py/build.xml?rev=992147&r1=992146&r2=992147&view=diff
==============================================================================
--- avro/branches/branch-1.4/lang/py/build.xml (original)
+++ avro/branches/branch-1.4/lang/py/build.xml Thu Sep  2 23:03:26 2010
@@ -149,7 +149,7 @@
           description="Build source distribution"
           depends="build">
     <mkdir dir="${dist.dir}"/>
-    <exec executable="${python}" failonerror="true">
+    <exec executable="${python}" failonerror="true" dir="${build.dir}">
       <arg value="${build.dir}/setup.py"/>
       <arg value="sdist"/>
       <arg value="--dist-dir=${dist.dir}"/>