OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-10-30 04:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the utility method to avoid using whitespace as the pattern separator (#1175)

Browse Source 
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@6664 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2008-01-15 05:26:38 +00:00
1 parent 71a88ce3a1
commit f80b714f17
5 files changed
+16 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/FilePath.java
+4 -17
View File
@@ -577,10 +577,7 @@ public final class FilePath implements Serializable {
* Runs Ant glob expansion.
*/
private static String[] glob(File dir, String includes) {
FileSet fs = new FileSet();
fs.setDir(dir);
fs.setIncludes(includes);
FileSet fs = Util.createFileSet(dir,includes);
DirectoryScanner ds = fs.getDirectoryScanner(new Project());
String[] files = ds.getIncludedFiles();
return files;
@@ -751,11 +748,7 @@ public final class FilePath implements Serializable {
CopyImpl copyTask = new CopyImpl();
copyTask.setTodir(new File(target.remote));
FileSet src = new FileSet();
src.setDir(base);
src.setIncludes(fileMask);
src.setExcludes(excludes);
copyTask.addFileset(src);
copyTask.addFileset(Util.createFileSet(base,fileMask,excludes));
copyTask.execute();
return copyTask.getNumCopied();
@@ -830,11 +823,7 @@ public final class FilePath implements Serializable {
* number of files/directories that are written.
*/
private Integer writeToTar(File baseDir, String fileMask, String excludes, Pipe pipe) throws IOException {
FileSet fs = new FileSet();
fs.setDir(baseDir);
fs.setIncludes(fileMask);
if(excludes!=null)
fs.setExcludes(excludes);
FileSet fs = Util.createFileSet(baseDir,fileMask,excludes);
byte[] buf = new byte[8192];
@@ -922,9 +911,7 @@ public final class FilePath implements Serializable {
String pattern = fileMask;
while(true) {
FileSet fs = new FileSet();
fs.setDir(dir);
fs.setIncludes(pattern);
FileSet fs = Util.createFileSet(dir,pattern);
DirectoryScanner ds = fs.getDirectoryScanner(new org.apache.tools.ant.Project());