From ba13aec15921709b22dac75bd7c561c318c61a7e Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 27 May 2012 20:03:08 -0400 Subject: [PATCH] extra launcher properties paths for missing and unmatched sbt.version --- launch/Configuration.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/launch/Configuration.scala b/launch/Configuration.scala index b704ec57c..f9e0f0f26 100644 --- a/launch/Configuration.scala +++ b/launch/Configuration.scala @@ -61,6 +61,8 @@ object Configuration } def multiPartError[T](firstLine: String, lines: List[T]) = error( (firstLine :: lines).mkString("\n\t") ) + def UnspecifiedVersionPart = "Unspecified" + def DefaultVersionPart = "Default" def DefaultBuildProperties = "project/build.properties" def SbtVersionProperty = "sbt.version" val ConfigurationName = "sbt.boot.properties" @@ -77,7 +79,7 @@ object Configuration def fallbackParts: List[String] = "" :: Nil def versionParts(version: Option[String]): List[String] = version match { - case None => fallbackParts + case None => UnspecifiedVersionPart :: fallbackParts case Some(v) => versionParts(v) } def versionParts(version: String): List[String] = @@ -87,7 +89,7 @@ object Configuration if(m.matches()) subPartsIndices map {_.map(m.group).filter(neNull).mkString(".") } else - fallbackParts + DefaultVersionPart :: fallbackParts } private[this] def subPartsIndices = (1 :: 2 :: Nil) ::