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

[bodewig]

bodewig     01/09/26 00:07:01

  Modified:    src/main/org/apache/tools/ant/taskdefs Zip.java
  Log:
  Fix logic of last patch to make <zipfileset src="foo.zip" /> work again.
  
  Revision  Changes    Path
  1.52      +4 -4      
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Zip.java  2001/09/24 16:28:05     1.51
  +++ Zip.java  2001/09/26 07:07:01     1.52
  @@ -428,14 +428,14 @@
                   entry = new ZipEntry(origEntry);
                   String vPath = entry.getName();
                   if (zipScanner.match(vPath)) {
  -                    if (prefix.length() > 0) {
  +                    if (fullpath.length() > 0) {
  +                        addParentDirs(null, fullpath, zOut, "");
  +                        zipFile(in, zOut, fullpath, entry.getTime());
  +                    } else {
                           addParentDirs(null, vPath, zOut, prefix);
                           if (! entry.isDirectory()) {
                               zipFile(in, zOut, prefix+vPath, entry.getTime());
                           }
  -                    }
  -                    else if (fullpath.length() > 0) {
  -                        zipFile(in, zOut, fullpath, entry.getTime());
                       }
                   }
               }