costin 2002/12/31 14:07:07
Modified: src/main/org/apache/tools/ant/helper ProjectHelper2.java
Log:
Ant is reusing the same helper
Revision Changes Path
1.8 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProjectHelper2.java 31 Dec 2002 17:33:58 -0000 1.7
+++ ProjectHelper2.java 31 Dec 2002 22:07:07 -0000 1.8
@@ -627,7 +627,7 @@
// XXX Move to Project ( so it is shared by all helpers )
String antFileProp="ant.file." + context.currentProjectName;
String dup=project.getProperty(antFileProp);
- if( dup!=null ) {
+ if( dup!=null && ! dup.equals(context.buildFile)) {
project.log("Duplicated project name in import. Project "+
context.currentProjectName + " defined first in " +
dup + " and again in " + context.buildFile,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
