← Back to branch summary

~ubuntu-branches/ubuntu/edgy/ant/edgy

« back to all changes in this revision

Viewing changes to src/main/org/apache/tools/ant/taskdefs/Deltree.java

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Gybas
  • Date: 2002-02-14 14:28:48 UTC
  • Revision ID: james.westby@ubuntu.com-20020214142848-g5e3i1w44rn4kn60
Tags: 1.4.1-4
http://bugs.debian.org/133291
http://bugs.debian.org/133641
* Applied patch from Adam Heath to not follow symlinks during deletion
  (closes: #133291)
* Copy the Ant startup script to /usr/share/ant/bin/ant (closes: #133641)
* Provide the upstream chaneglog (WHATSNEW)
* The package can now be compiled with j2sdk1.3 1.3.1-1.1 (which has
  JAVA_HOME set to /usr/lib/j2se/1.3) and 1.3.1-1 (which has JAVA_HOME set
  to /usr/lib/j2sdk1.3).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/org/apache/tools/ant/taskdefs/Deltree.java
117
117
        for (int i = 0; i < list.length; i++) {
118
118
            String s = list[i];
119
119
            File f = new File(dir, s);
120
 
            if (f.isDirectory()) {
121
 
                removeDir(f);
122
 
            } else {
123
 
                if (!f.delete()) {
 
120
            if (!f.delete()) {
 
121
                if (f.isDirectory()) {
 
122
                    removeDir(f);
 
123
                } else {
124
124
                    throw new BuildException("Unable to delete file " + f.getAbsolutePath());
125
125
                }
126
126
            }