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

Fix regression where IOExceptions were not caught on trying to access disk. 

Fixes #1632
This commit is contained in:
Josh Suereth 2014-10-01 08:04:39 -04:00
parent e96d40ebbd
commit b9dc9f8f4f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ivy/src/main/scala/sbt/Resolver.scala
View File

@ -3,7 +3,7 @@
*/ */
package sbt package sbt
import java.io.File import java.io.{ IOException, File }
import java.net.URL import java.net.URL
import scala.xml.{ Text, NodeSeq, Elem, XML } import scala.xml.{ Text, NodeSeq, Elem, XML }
import org.apache.ivy.plugins.resolver.DependencyResolver import org.apache.ivy.plugins.resolver.DependencyResolver
@ -312,6 +312,8 @@ object Resolver {
} catch { } catch {
// Occurs inside File constructor when property or environment variable does not exist // Occurs inside File constructor when property or environment variable does not exist
case _: NullPointerException => None case _: NullPointerException => None
// Occurs when File does not exist
case _: IOException => None
case e: SAXParseException => System.err.println(s"WARNING: Problem parsing ${f().getAbsolutePath}, ${e.getMessage}"); None case e: SAXParseException => System.err.println(s"WARNING: Problem parsing ${f().getAbsolutePath}, ${e.getMessage}"); None
} }
loadHomeFromSettings(() => new File(Path.userHome, ".m2/settings.xml")) orElse loadHomeFromSettings(() => new File(Path.userHome, ".m2/settings.xml")) orElse