You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by co...@apache.org on 2001/07/07 12:19:33 UTC
cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs CopyfileTest.java
conor 01/07/07 03:19:32
Modified: src/etc/testcases/taskdefs copyfile.xml
src/main/org/apache/tools/ant Project.java
src/testcases/org/apache/tools/ant/taskdefs
CopyfileTest.java
Log:
Only delete the target file when it is in fact a file - don't
delete directories.
Revision Changes Path
1.4 +1 -0 jakarta-ant/src/etc/testcases/taskdefs/copyfile.xml
Index: copyfile.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/copyfile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- copyfile.xml 2001/03/08 15:17:19 1.3
+++ copyfile.xml 2001/07/07 10:19:27 1.4
@@ -25,6 +25,7 @@
</target>
<target name="test6">
+ <delete file="testdir"/>
<mkdir dir="testdir" />
<copyfile src="copyfile.xml"
dest="testdir"
1.61 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Project.java 2001/07/04 14:40:28 1.60
+++ Project.java 2001/07/07 10:19:29 1.61
@@ -755,7 +755,7 @@
if (overwrite || !destFile.exists() ||
destFile.lastModified() < sourceFile.lastModified()) {
- if (destFile.exists()) {
+ if (destFile.exists() && destFile.isFile()) {
destFile.delete();
}
1.5 +0 -5 jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
Index: CopyfileTest.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CopyfileTest.java 2001/03/08 15:17:23 1.4
+++ CopyfileTest.java 2001/07/07 10:19:31 1.5
@@ -102,9 +102,4 @@
fail("Copy failed");
}
}
-/*
- public void test6() {
- expectBuildException("test6", "target is directory");
- }
-*/
}