ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
Date Thu, 14 Aug 2003 11:37:36 GMT
antoine     2003/08/14 04:37:36

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
  Log:
  files which are pointed to by symbolic links should be excluded if followsymlinks="false"
  
  Revision  Changes    Path
  1.46      +4 -3      ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- FTP.java	7 Aug 2003 22:23:35 -0000	1.45
  +++ FTP.java	14 Aug 2003 11:37:36 -0000	1.46
  @@ -290,9 +290,10 @@
                                           name + File.separator, fast);
                               }
                           } else {
  -                            if (isFunctioningAsFile(ftp, dir, file)) {
  -                                String name = vpath + file.getName();
  -
  +                            String name = vpath + file.getName();
  +                            if (!isFollowSymlinks() && file.isSymbolicLink()) {
  +                                dirsExcluded.addElement(name);
  +                            } else if (isFunctioningAsFile(ftp, dir, file)) {
                                   if (isIncluded(name)) {
                                       if (!isExcluded(name)) {
                                           filesIncluded.addElement(name);
  
  
  

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


Mime
View raw message