From 2b3f34f6f62d0fcef8dfc6dbab825d90bb01102c Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Wed, 1 Oct 2014 08:18:09 -0400 Subject: [PATCH] Add file existence check for Eugene. --- ivy/src/main/scala/sbt/Resolver.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index 7f558181d..57a73dec2 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -304,11 +304,12 @@ object Resolver { private[this] def mavenLocalDir: File = { def loadHomeFromSettings(f: () => File): Option[File] = try { - val file = XML.loadFile(f()) - (file \ "localRepository").text match { + val file = f() + if(!file.exists) None + else ((XML.loadFile(file) \ "localRepository").text match { case "" => None case e @ _ => Some(new File(e)) - } + }) } catch { // Occurs inside File constructor when property or environment variable does not exist case _: NullPointerException => None