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

Better representation of no cross-version suffix in suffix conflict error message.

This commit is contained in:
Mark Harrah 2013-10-23 09:46:43 -04:00
parent 7de1b4bf3d
commit 57306e6257
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ivy/src/main/scala/sbt/ConflictWarning.scala
View File

@ -38,7 +38,7 @@ object ConflictWarning
val conflictMsgs = val conflictMsgs =
for( ((org,rawName), fullNames) <- crossMismatches ) yield for( ((org,rawName), fullNames) <- crossMismatches ) yield
{ {
val suffixes = fullNames.map(n => "_" + getCrossSuffix(n)).mkString(", ") val suffixes = fullNames.map(getCrossSuffix).mkString(", ")
s"${idString(org,rawName)} $suffixes" s"${idString(org,rawName)} $suffixes"
} }
log.log(config.level, conflictMsgs.mkString(pre, "\n ", "")) log.log(config.level, conflictMsgs.mkString(pre, "\n ", ""))
@ -73,8 +73,8 @@ object ConflictWarning
case _ => s case _ => s
} }
private[this] def getCrossSuffix(s: String): String = s match { private[this] def getCrossSuffix(s: String): String = s match {
case CrossSuffixPattern(_, v) => v case CrossSuffixPattern(_, v) => "_" + v
case _ => "" case _ => "<none>"
} }
} }