You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2010/09/03 01:03:27 UTC

svn commit: r992147 - in /avro/branches/branch-1.4: ./ CHANGES.txt lang/py/build.xml

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}"/>