From 4e6cbd73042701b1e568d620d846ac1c1cfb78ae Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 11 May 2012 21:24:05 -0400 Subject: [PATCH] delete symlink and not its contents when recursively deleting a directory --- util/io/IO.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/util/io/IO.scala b/util/io/IO.scala index d4afd1dc6..3a99b49e6 100644 --- a/util/io/IO.scala +++ b/util/io/IO.scala @@ -332,13 +332,12 @@ object IO { translate("Error deleting file " + file + ": ") { - if(file.isDirectory) + val deleted = file.delete() + if(!deleted && file.isDirectory) { delete(listFiles(file)) file.delete } - else if(file.exists) - file.delete } }