[patch] The patch avoids the inclusion of implicit files that leads to the loss of unexpected files

delete.diff (text/plain), 1.70 KB, created by Inta on 2008-12-13 17:29:44 UTC

(hide)

Description: The patch avoids the inclusion of implicit files that leads to the loss of unexpected files

Filename:

MIME Type:

Creator: Inta

Created: 2008-12-13 17:29:44 UTC

Size: 1.70 KB

patch

obsolete

>Index: Delete.java >=================================================================== >--- Delete.java (revision 726284) >+++ Delete.java (working copy) >@@ -104,7 +104,9 @@ > protected boolean usedMatchingTask = false; > // by default, remove matching empty dirs > protected boolean includeEmpty = false; >- >+ >+ private boolean createInclude = false; >+ private boolean createIncludesFile = false; > private int verbosity = Project.MSG_VERBOSE; > private boolean quiet = false; > private boolean failonerror = true; >@@ -215,6 +217,7 @@ > */ > public PatternSet.NameEntry createInclude() { > usedMatchingTask = true; >+ createInclude = true; > return super.createInclude(); > } > >@@ -223,7 +226,8 @@ > * @return an NameEntry object to be configured > */ > public PatternSet.NameEntry createIncludesFile() { >- usedMatchingTask = true; >+ usedMatchingTask = true; >+ createIncludesFile = true; > return super.createIncludesFile(); > } > >@@ -548,10 +552,12 @@ > filesetDirs.setProject(getProject()); > FileSet implicit = null; > if (usedMatchingTask && dir != null && dir.isDirectory()) { >- //add the files from the default fileset: >- implicit = getImplicitFileSet(); >- implicit.setProject(getProject()); >- filesets.add(implicit); >+ if (!(!createInclude && createIncludesFile)) { >+ //add the files from the default fileset: >+ implicit = getImplicitFileSet(); >+ implicit.setProject(getProject()); >+ filesets.add(implicit); >+ } > } > > for (int i = 0, size = filesets.size(); i < size; i++) { View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]