# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1246540797 -3600
# Node ID c3aa5da4cb96306ce163f6380259bd4169bd6464
# Parent  f1f162027366b9aee79a7153f5d83b022d02532d# Parent  06dc202a1369ef9b1109fd72b87b9c836fe9e1dd
catchup merge

diff -r 06dc202a1369 -r c3aa5da4cb96 common/build.xml
--- a/common/build.xml	Thu Jul 02 12:43:44 2009 +0100
+++ b/common/build.xml	Thu Jul 02 14:19:57 2009 +0100
@@ -87,7 +87,7 @@
 				<echo message="Generating Hg local cache..." />
 				<exec executable="perl" dir="${build.log.dir}" failonerror="true" output="${build.log.dir}/${build.id}_hgcache.log">
 					<arg value="${sf.common.config.dir}/tools/cachefiles.pl"/>
-					<arg value="${sf.spec.job.rootdir}/hgcache"/>
+					<arg value="${sf.spec.sourcesync.cachelocation}"/>
 					<arg value="${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}"/>
 					<arg value="${sf.common.config.dir}/generated/${sf.spec.sourcesync.sourcespecfile}"/>
 				</exec>
diff -r 06dc202a1369 -r c3aa5da4cb96 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Thu Jul 02 12:43:44 2009 +0100
+++ b/common/common_props.ant.xml	Thu Jul 02 14:19:57 2009 +0100
@@ -36,6 +36,7 @@
     <property name="sf.spec.sourcesync.enable" value="true"/>
     <property name="sf.spec.sourcesync.usecache" value="false"/>
     <property name="sf.spec.sourcesync.sourcespecfile" value="sources.csv"/>
+    <property name="sf.spec.sourcesync.cachelocation" value="${sf.spec.job.rootdir}/hgcache"/>
     
     <property name="sf.spec.baseline.enable" value="true"/>
     <property name="sf.spec.baseline.select" value="auto"/> <!-- auto|explicit|location -->
diff -r 06dc202a1369 -r c3aa5da4cb96 common/tools/cachefiles.pl
--- a/common/tools/cachefiles.pl	Thu Jul 02 12:43:44 2009 +0100
+++ b/common/tools/cachefiles.pl	Thu Jul 02 14:19:57 2009 +0100
@@ -31,7 +31,7 @@
     my @args = split(',',$line);
     my $repo = shift @args;
 	my $master = "";
-	if ( $repo =~ m/^(.*\/)((oss|rnd|sfl)\/.*\/)$/i )
+	if ( $repo =~ m/^(.*\/)(.*\/(oss|rnd|sfl)\/.*\/)$/i )
 	{
 		$master = $1;
 		$repo = $2;