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

Filter out null parent files when deleting empty directories. Closes #589.

This commit is contained in:
Eugene Vigdorchik 2012-11-12 14:22:36 +04:00 committed by Mark Harrah
parent 657d842238
commit 761a441805
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/io/IO.scala
View File

@ -331,7 +331,7 @@ object IO
def deleteFilesEmptyDirs(files: Iterable[File]): Unit = def deleteFilesEmptyDirs(files: Iterable[File]): Unit =
{ {
def isEmptyDirectory(dir: File) = dir.isDirectory && listFiles(dir).isEmpty def isEmptyDirectory(dir: File) = dir.isDirectory && listFiles(dir).isEmpty
def parents(fs: Set[File]) = fs.map(_.getParentFile) def parents(fs: Set[File]) = fs flatMap { f => Option(f.getParentFile) }
def deleteEmpty(dirs: Set[File]) def deleteEmpty(dirs: Set[File])
{ {
val empty = dirs filter isEmptyDirectory val empty = dirs filter isEmptyDirectory