From 67e32ff8faf8fa596197a405c5958c2b2908d796 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Mon, 2 Nov 2015 12:29:12 +0100 Subject: [PATCH] FileUtils.copy now filters out source control folders. Also, dir is checked for existence before creating it. Fixes #4034 --- arduino-core/src/processing/app/helpers/FileUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arduino-core/src/processing/app/helpers/FileUtils.java b/arduino-core/src/processing/app/helpers/FileUtils.java index 77ef6ead9..e256b0160 100644 --- a/arduino-core/src/processing/app/helpers/FileUtils.java +++ b/arduino-core/src/processing/app/helpers/FileUtils.java @@ -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); } }