mirror of
https://github.com/sbt/sbt.git
synced 2026-10-06 10:03:56 +02:00
Better representation of no cross-version suffix in suffix conflict error message.
This commit is contained in:
@@ -38,7 +38,7 @@ object ConflictWarning
|
||||
val conflictMsgs =
|
||||
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"
|
||||
}
|
||||
log.log(config.level, conflictMsgs.mkString(pre, "\n ", ""))
|
||||
@@ -73,8 +73,8 @@ object ConflictWarning
|
||||
case _ => s
|
||||
}
|
||||
private[this] def getCrossSuffix(s: String): String = s match {
|
||||
case CrossSuffixPattern(_, v) => v
|
||||
case _ => ""
|
||||
case CrossSuffixPattern(_, v) => "_" + v
|
||||
case _ => "<none>"
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user