Return-Path: 
 <commits-return-52738-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 26088 invoked from network); 2 Apr 2008 09:00:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Apr 2008 09:00:43 -0000
Received: (qmail 79849 invoked by uid 500); 2 Apr 2008 09:00:43 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 79824 invoked by uid 500); 2 Apr 2008 09:00:43 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 79815 invoked by uid 99); 2 Apr 2008 09:00:42 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 02:00:42 -0700
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.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 09:00:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E367D1A9832; Wed,  2 Apr 2008 02:00:19 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r643801 -
 /harmony/enhanced/common_resources/trunk/make/svn.xml
Date: Wed, 02 Apr 2008 09:00:19 -0000
To: commits@harmony.apache.org
From: varlax@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080402090019.E367D1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: varlax
Date: Wed Apr  2 02:00:17 2008
New Revision: 643801

URL: http://svn.apache.org/viewvc?rev=643801&view=rev
Log:
Fixed SVN fetching for federated build (collision on "svn.revision" property).

Modified:
    harmony/enhanced/common_resources/trunk/make/svn.xml

Modified: harmony/enhanced/common_resources/trunk/make/svn.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/svn.xml?rev=643801&r1=643800&r2=643801&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/svn.xml (original)
+++ harmony/enhanced/common_resources/trunk/make/svn.xml Wed Apr  2 02:00:17 2008
@@ -27,17 +27,17 @@
     
     <target name="fetch-svn">
         <setup-svn dep="${dependency}"/>
-        <antcall target="svn-co">
+        <antcall target="svn-co" inheritAll="false">
             <propertyset>
                 <propertyref prefix="${dependency}."/>
-                <mapper type="glob" from="${dependency}.*" to="*"/>
+                <mapper type="glob" from="${dependency}.*" to="dep.*"/>
             </propertyset>
         </antcall>
     </target>
 
-    <target name="svn-co" unless="svn.dir.uptodate">
+    <target name="svn-co" unless="dep.svn.dir.uptodate">
         <exec executable="svn" failonerror="true">
-            <arg line="co -r ${svn.revision} ${svn.url} ${svn.dir}" />
+            <arg line="co -r ${dep.svn.revision} ${dep.svn.url} ${dep.svn.dir}" />
         </exec>
     </target>