noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FileUtils.copy now filters out source control folders. Also, dir is checked for existence before creating it. Fixes #4034

This commit is contained in:
Federico Fissore 2015-11-02 12:29:12 +01:00
parent f5c3136b34
commit 67e32ff8fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arduino-core/src/processing/app/helpers/FileUtils.java
View File

@ -58,12 +58,12 @@ public class FileUtils {
public static void copy(File sourceFolder, File destFolder) throws IOException {
for (File file : sourceFolder.listFiles()) {
File destFile = new File(destFolder, file.getName());
if (file.isDirectory()) {
if (!destFile.mkdir()) {
if (file.isDirectory() && !SOURCE_CONTROL_FOLDERS.contains(file.getName())) {
if (!destFile.exists() && !destFile.mkdir()) {
throw new IOException("Unable to create folder: " + destFile);
}
copy(file, destFile);
} else {
} else if (!file.isDirectory()) {
copyFile(file, destFile);
}
}