diff --git a/WHATSNEW b/WHATSNEW index 8548f7be3..a55eed50f 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -322,6 +322,9 @@ Fixed bugs: connetced to, potentially leading to exceptions in commons-net. Bugzilla Report 33618. +* 's defaultexcludes attribute was ignored when an archive was + updated. Bugzilla Report 33412. + Changes from Ant 1.6.1 to Ant 1.6.2 =================================== diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index e0db2e9da..f96cfa8b6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -524,6 +524,8 @@ public class Zip extends MatchingTask { ZipFileSet oldFiles = new ZipFileSet(); oldFiles.setProject(getProject()); oldFiles.setSrc(renamedFile); + oldFiles.setDefaultexcludes(getImplicitFileSet() + .getDefaultexcludes()); for (int i = 0; i < addedFiles.size(); i++) { PatternSet.NameEntry ne = oldFiles.createExclude();