You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2003/11/03 11:14:49 UTC
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ImportTask.java
peterreilly 2003/11/03 02:14:49
Modified: src/main/org/apache/tools/ant/taskdefs ImportTask.java
Log:
Opps, last change broke relative import
Revision Changes Path
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ImportTask.java 31 Oct 2003 15:59:45 -0000 1.18
+++ ImportTask.java 3 Nov 2003 10:14:49 -0000 1.19
@@ -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: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ImportTask.java
Posted by peter reilly <pe...@corvil.com>.
Blush!
No I did not run them correctly
Peter
On Monday 03 November 2003 10:30, Stefan Bodewig wrote:
> On 3 Nov 2003, <pe...@apache.org> wrote:
> > Opps, last change broke relative import
>
> Hmm, missing unit test? ;-)
>
> Stefan
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ImportTask.java
Posted by Stefan Bodewig <bo...@apache.org>.
On 3 Nov 2003, <pe...@apache.org> wrote:
> Opps, last change broke relative import
Hmm, missing unit test? ;-)
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org