log conflict messages as one unit

This commit is contained in:
Mark Harrah 2011-07-27 19:50:58 -04:00
parent e75628c81b
commit 0357cf88ff
1 changed files with 7 additions and 3 deletions

View File

@ -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 )
}