Author: nickboldt Date: 2010-04-24 01:02:58 -0400 (Sat, 24 Apr 2010) New Revision: 21659 Modified: branches/modular_build/build/build.xml Log: improve failonerror handling in case svn dies trying to <info> or <update> Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-04-24 04:55:21 UTC (rev 21658) +++ branches/modular_build/build/build.xml 2010-04-24 05:02:58 UTC (rev 21659) @@ -161,13 +161,13 @@ <if> <equals arg1="@{op}" arg2="up" /> <then> - <svn javahl="false" svnkit="true"> + <svn javahl="false" svnkit="true" failonerror="false"> <update recurse="${svn.recurse}" dir="@{COMPONENT}" /> </svn> </then> <else> <echo level="info">Fetch sources from ${svn.root}/@{COMPONENT} into ${WORKINGDIR}/@{COMPONENT}</echo> - <svn javahl="false" svnkit="true"> + <svn javahl="false" svnkit="true" failonerror="true"> <checkout recurse="${svn.recurse}" url="${svn.root}/@{COMPONENT}" destpath="${WORKINGDIR}/@{COMPONENT}" @@ -177,11 +177,16 @@ </if> <!-- Store svn info so we can compare it later and thus not need to update or checkout every time --> - <svn javahl="false" svnkit="true"> + <svn javahl="false" svnkit="true" failonerror="false"> <info target="${WORKINGDIR}/@{COMPONENT}" propprefix="svn.info.@{COMPONENT}" /> </svn> - <echo file=&quot;svn.info-@{COMPONENT}.txt&quot;&gt;svn.info.(a){COMPONENT}.rev = ${svn.info.(a){COMPONENT}.rev} + <if> + <isset property=&quot;svn.info.(a){COMPONENT}.rev&quot; /> + <then> + <echo file=&quot;svn.info-@{COMPONENT}.txt&quot;&gt;svn.info.(a){COMPONENT}.rev = ${svn.info.(a){COMPONENT}.rev} </echo> + </then> + </if> <echo file="build.cfg" message="@{COMPONENT}," append="true" /> </sequential> </macrodef> @@ -204,17 +209,25 @@ <then> <property file=&quot;svn.info-(a){COMPONENT}.txt&quot; /> <!-- check svn info; if new version found, svn up --> - <svn javahl="false" svnkit="true"> + <svn javahl="false" svnkit="true" failonerror="false"> <info target="${WORKINGDIR}/@{COMPONENT}" propprefix=&quot;svn.info.(a){COMPONENT}.check&quot; /> </svn> <if> - <not> - <equals arg1=&quot;${svn.info.(a){COMPONENT}.rev}&quot; - arg2=&quot;${svn.info.(a){COMPONENT}.check.rev}&quot; - /> - </not> + <or> + <not> + <isset property=&quot;svn.info.(a){COMPONENT}.rev&quot; /> + </not> + <not> + <isset property=&quot;svn.info.(a){COMPONENT}.check.rev&quot; /> + </not> + <not> + <equals arg1=&quot;${svn.info.(a){COMPONENT}.rev}&quot; + arg2=&quot;${svn.info.(a){COMPONENT}.check.rev}&quot; + /> + </not> + </or> <then> <svn.fetch component="@{COMPONENT}" op="up" /> </then>