ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
Date Mon, 21 Feb 2005 08:40:16 GMT
bodewig     2005/02/21 00:40:16

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Zip.java
  Log:
  On second thought, this seems to be the real fix for
  PR: 33412
  
  when updating an archive, we never want to drop files from the
  original archive, no matter what the current default excludes setting
  says.
  
  Revision  Changes    Path
  1.751     +2 -2      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.750
  retrieving revision 1.751
  diff -u -r1.750 -r1.751
  --- WHATSNEW	18 Feb 2005 13:15:28 -0000	1.750
  +++ WHATSNEW	21 Feb 2005 08:40:16 -0000	1.751
  @@ -322,8 +322,8 @@
     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.
  +* <zip> would drop files matched by defaultexcludes during updates.
  +  Bugzilla Report 33412.
   
   * <zip> couldn't store files with size between 2GB and 4GB (the
     upper limit set by the ZIP format itself).  Bugzilla Report 33310.
  
  
  
  1.137     +1 -2      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.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- Zip.java	18 Feb 2005 12:24:16 -0000	1.136
  +++ Zip.java	21 Feb 2005 08:40:16 -0000	1.137
  @@ -524,8 +524,7 @@
                       ZipFileSet oldFiles = new ZipFileSet();
                       oldFiles.setProject(getProject());
                       oldFiles.setSrc(renamedFile);
  -                    oldFiles.setDefaultexcludes(getImplicitFileSet()
  -                                                .getDefaultexcludes());
  +                    oldFiles.setDefaultexcludes(false);
   
                       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


Mime
View raw message