From 782e4511518e3ccc4d1e14b608b2442fc1cb7010 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 18 Feb 2005 12:24:16 +0000
Subject: [PATCH] <zip> update ignored defaultexcludes, PR 33412

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277685 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                        | 3 +++
 src/main/org/apache/tools/ant/taskdefs/Zip.java | 2 ++
 2 files changed, 5 insertions(+)

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.
 
+* <zip>'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();