You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ll...@apache.org on 2012/12/15 04:16:18 UTC

svn commit: r1422178 - /hadoop/common/branches/branch-1/build.xml

Author: llu
Date: Sat Dec 15 03:16:17 2012
New Revision: 1422178

URL: http://svn.apache.org/viewvc?rev=1422178&view=rev
Log:
HADOOP-9051 Fix ant clean/test with circular symlinks in build dir. (llu)

Modified:
    hadoop/common/branches/branch-1/build.xml

Modified: hadoop/common/branches/branch-1/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1422178&r1=1422177&r2=1422178&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Sat Dec 15 03:16:17 2012
@@ -1054,7 +1054,7 @@
       <delete file="${test.build.dir}/testsfailed"/>
       <delete dir="@{test.dir}/data" />
       <mkdir dir="@{test.dir}/data" />
-      <delete dir="@{test.dir}/logs" />
+      <delete dir="@{test.dir}/logs" followSymlinks="false"/>
       <mkdir dir="@{test.dir}/logs" />
       <copy file="${test.src.dir}/hadoop-policy.xml"
             todir="@{test.dir}/extraconf" />
@@ -1971,7 +1971,7 @@
   <!-- Clean.  Delete the build files, and their directories              -->
   <!-- ================================================================== -->
   <target name="clean" depends="clean-contrib, clean-sign, clean-fi" description="Clean.  Delete the build files, and their directories">
-    <delete dir="${build.dir}"/>
+    <delete dir="${build.dir}" followSymlinks="false"/>
     <delete dir="${docs.src}/build"/>
     <delete dir="${src.docs.cn}/build"/>
     <delete dir="${package.buildroot}"/>