From 7547a70991386c859e6022572c5121edc2a3956c Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 5 Oct 2014 04:24:22 -0400 Subject: [PATCH] Fixed json serialization turning license into {}. --- ivy/src/main/scala/sbt/IvyRetrieve.scala | 3 ++- ivy/src/main/scala/sbt/Resolver.scala | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ivy/src/main/scala/sbt/IvyRetrieve.scala b/ivy/src/main/scala/sbt/IvyRetrieve.scala index bb15c68df..1e74f3955 100644 --- a/ivy/src/main/scala/sbt/IvyRetrieve.scala +++ b/ivy/src/main/scala/sbt/IvyRetrieve.scala @@ -128,7 +128,8 @@ object IvyRetrieve { val licenses: Seq[(String, Option[String])] = mdOpt match { case Some(md) => md.getLicenses.toArray.toVector collect { case lic: IvyLicense if Option(lic.getName).isDefined => - (lic.getName, nonEmptyString(lic.getUrl)) + val temporaryURL = "http://localhost" + (lic.getName, nonEmptyString(lic.getUrl) orElse { Some(temporaryURL) }) } case _ => Nil } diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index 57a73dec2..c7e67f876 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -305,7 +305,7 @@ object Resolver { def loadHomeFromSettings(f: () => File): Option[File] = try { val file = f() - if(!file.exists) None + if (!file.exists) None else ((XML.loadFile(file) \ "localRepository").text match { case "" => None case e @ _ => Some(new File(e))