Browse Source

Don't defer setting of default excludes for the implicit fileset,

thereby making <tar basedir="..."> and <zip basedir="..."> honor this
attribute.

PR: 18637


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274415 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
b3d02c1801
1 changed files with 1 additions and 3 deletions
  1. +1
    -3
      src/main/org/apache/tools/ant/taskdefs/MatchingTask.java

+ 1
- 3
src/main/org/apache/tools/ant/taskdefs/MatchingTask.java View File

@@ -96,7 +96,6 @@ import org.apache.tools.ant.types.selectors.SizeSelector;

public abstract class MatchingTask extends Task implements SelectorContainer {

protected boolean useDefaultExcludes = true;
protected FileSet fileset = new FileSet();

/**
@@ -214,7 +213,7 @@ public abstract class MatchingTask extends Task implements SelectorContainer {
* shouldn't be used.
*/
public void setDefaultexcludes(boolean useDefaultExcludes) {
this.useDefaultExcludes = useDefaultExcludes;
fileset.setDefaultexcludes(useDefaultExcludes);
}

/**
@@ -222,7 +221,6 @@ public abstract class MatchingTask extends Task implements SelectorContainer {
*/
protected DirectoryScanner getDirectoryScanner(File baseDir) {
fileset.setDir(baseDir);
fileset.setDefaultexcludes(useDefaultExcludes);
return fileset.getDirectoryScanner(getProject());
}



Loading…
Cancel
Save