Author: bodewig
Date: Thu Oct 20 12:01:48 2005
New Revision: 326976
URL: http://svn.apache.org/viewcvs?rev=326976&view=rev
Log:
tweak a backwards incompatibilty in <tar>
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java?rev=326976&r1=326975&r2=326976&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java Thu Oct 20
12:01:48 2005
@@ -323,6 +323,18 @@
protected void tarFile(File file, TarOutputStream tOut, String vPath,
TarFileSet tarFileSet)
throws IOException {
+ if (file.equals(tarFile)) {
+ // If the archive is built for the first time and it is
+ // matched by a resource collection, then it hasn't been
+ // found in check (it hasn't been there) but will be
+ // included now.
+ //
+ // for some strange reason the old code would simply skip
+ // the entry and not fail, do the same now for backwards
+ // compatibility reasons. Without this, the which4j build
+ // fails in Gump
+ return;
+ }
tarResource(new FileResource(file), tOut, vPath, tarFileSet);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
