Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 30872 invoked from network); 6 Jan 2003 16:01:12 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 6 Jan 2003 16:01:12 -0000 Received: (qmail 27158 invoked by uid 97); 6 Jan 2003 16:02:19 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 27140 invoked by uid 97); 6 Jan 2003 16:02:19 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 27102 invoked by uid 97); 6 Jan 2003 16:02:18 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 6 Jan 2003 16:00:56 -0000 Message-ID: <20030106160056.33559.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/helper ProjectHelper2.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N costin 2003/01/06 08:00:56 Modified: src/main/org/apache/tools/ant/helper ProjectHelper2.java Log: Warn of duplicated project name only if importing. There are normal cases ( antcall) where the same build file is parsed many times ( this could be avoided now - as an optimization ). It is a problem only in import, because of the target conflict resolution. ( targets are qualified with the project name ) Revision Changes Path 1.11 +2 -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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ProjectHelper2.java 6 Jan 2003 07:30:34 -0000 1.10 +++ ProjectHelper2.java 6 Jan 2003 16:00:55 -0000 1.11 @@ -629,7 +629,8 @@ String dup = project.getProperty(antFileProp); if (dup != null) { File dupFile = new File(dup); - if (!dupFile.equals(context.buildFile)) { + if( context.ignoreProjectTag && + !dupFile.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: For additional commands, e-mail: