You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2005/02/18 13:24:16 UTC

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java

bodewig     2005/02/18 04:24:16

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Zip.java
  Log:
  <zip> update ignored defaultexcludes, PR 33412
  
  Revision  Changes    Path
  1.749     +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.748
  retrieving revision 1.749
  diff -u -r1.748 -r1.749
  --- WHATSNEW	18 Feb 2005 11:00:57 -0000	1.748
  +++ WHATSNEW	18 Feb 2005 12:24:15 -0000	1.749
  @@ -322,6 +322,9 @@
     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
   ===================================
   
  
  
  
  1.136     +2 -0      ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.135
  retrieving revision 1.136
  diff -u -r1.135 -r1.136
  --- Zip.java	2 Feb 2005 23:55:50 -0000	1.135
  +++ Zip.java	18 Feb 2005 12:24:16 -0000	1.136
  @@ -524,6 +524,8 @@
                       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();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org