You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by mb...@apache.org on 2006/08/31 22:40:27 UTC
svn commit: r439042 -
/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
Author: mbenson
Date: Thu Aug 31 13:40:26 2006
New Revision: 439042
URL: http://svn.apache.org/viewvc?rev=439042&view=rev
Log:
Be more specific logging imports.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ImportTask.java?rev=439042&r1=439041&r2=439042&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ImportTask.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ImportTask.java Thu Aug 31 13:40:26 2006
@@ -111,17 +111,16 @@
throw new BuildException("Unable to get location of import task");
}
- File buildFile = new File(getLocation().getFileName());
- buildFile = new File(buildFile.getAbsolutePath());
-
- getProject().log("Importing file " + file + " from "
- + buildFile.getAbsolutePath(), Project.MSG_VERBOSE);
+ File buildFile = new File(getLocation().getFileName()).getAbsoluteFile();
// Paths are relative to the build file they're imported from,
// *not* the current directory (same as entity includes).
File buildFileParent = new File(buildFile.getParent());
File importedFile = FILE_UTILS.resolveFile(buildFileParent, file);
+
+ getProject().log("Importing file " + importedFile + " from "
+ + buildFile.getAbsolutePath(), Project.MSG_VERBOSE);
if (!importedFile.exists()) {
String message =
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org