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

Add warning for bad XML parse of settings file

This commit is contained in:
Brian Topping 2014-09-22 10:56:10 -04:00
parent 31acddf856
commit 59ea77e590
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import java.io.File
import java.net.URL
import scala.xml.{ Text, NodeSeq, Elem, XML }
import org.apache.ivy.plugins.resolver.DependencyResolver
import org.xml.sax.SAXParseException
sealed trait Resolver {
def name: String
@ -311,6 +312,7 @@ object Resolver {
} catch {
// Occurs inside File constructor when property or environment variable does not exist
case _: NullPointerException => 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(new File(System.getenv("M2_HOME")), "conf/settings.xml")) getOrElse