Browse Source

Only delete the target file when it is in fact a file - don't

delete directories.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269282 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 24 years ago
parent
commit
30cf43949a
3 changed files with 2 additions and 6 deletions
  1. +1
    -0
      src/etc/testcases/taskdefs/copyfile.xml
  2. +1
    -1
      src/main/org/apache/tools/ant/Project.java
  3. +0
    -5
      src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java

+ 1
- 0
src/etc/testcases/taskdefs/copyfile.xml View File

@@ -25,6 +25,7 @@
</target>

<target name="test6">
<delete file="testdir"/>
<mkdir dir="testdir" />
<copyfile src="copyfile.xml"
dest="testdir"


+ 1
- 1
src/main/org/apache/tools/ant/Project.java View File

@@ -755,7 +755,7 @@ public class Project {
if (overwrite || !destFile.exists() ||
destFile.lastModified() < sourceFile.lastModified()) {

if (destFile.exists()) {
if (destFile.exists() && destFile.isFile()) {
destFile.delete();
}



+ 0
- 5
src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java View File

@@ -102,9 +102,4 @@ public class CopyfileTest extends TaskdefsTest {
fail("Copy failed");
}
}
/*
public void test6() {
expectBuildException("test6", "target is directory");
}
*/
}

Loading…
Cancel
Save