mirror of https://github.com/sbt/sbt.git
log conflict messages as one unit
This commit is contained in:
parent
e75628c81b
commit
0357cf88ff
|
|
@ -11,9 +11,13 @@ object ConflictWarning
|
|||
{
|
||||
val conflicts = IvyActions.groupedConflicts(config.filter, config.group)(report)
|
||||
if(!conflicts.isEmpty)
|
||||
log.log(config.level, "Potentially incompatible versions specified by " + config.label + ":")
|
||||
for( (label, versions) <- conflicts )
|
||||
log.log(config.level, " " + label + ": " + versions.mkString(", "))
|
||||
{
|
||||
val msg = "Potentially incompatible versions specified by " + config.label + ":"
|
||||
val conflictMsgs =
|
||||
for( (label, versions) <- conflicts ) yield
|
||||
label + ": " + versions.mkString(", ")
|
||||
log.log(config.level, msg + conflictMsgs.mkString(msg, "\n ", ""))
|
||||
}
|
||||
if(config.failOnConflict && !conflicts.isEmpty)
|
||||
error("Conflicts in " + conflicts.map(_._1).mkString )
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue