peterreilly 2003/11/03 02:16:38
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ImportTask.java
Log:
sync with head
Revision Changes Path
No revision
No revision
1.16.2.3 +3 -1
ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
Index: ImportTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -r1.16.2.2 -r1.16.2.3
--- ImportTask.java 31 Oct 2003 16:09:22 -0000 1.16.2.2
+++ ImportTask.java 3 Nov 2003 10:16:38 -0000 1.16.2.3
@@ -154,7 +154,9 @@
// Paths are relative to the build file they're imported from,
// *not* the current directory (same as entity includes).
- File importedFile = FILE_UTILS.resolveFile(buildFile, file);
+
+ File buildFileParent = new File(buildFile.getParent());
+ File importedFile = FILE_UTILS.resolveFile(buildFileParent, file);
if (!importedFile.exists()) {
String message =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
