remove duplication in conflict warning message

This commit is contained in:
Mark Harrah 2011-08-22 22:48:21 -04:00
parent c121c1745a
commit ba33a73271
1 changed files with 1 additions and 1 deletions

View File

@ -16,7 +16,7 @@ object ConflictWarning
val conflictMsgs = val conflictMsgs =
for( (label, versions) <- conflicts ) yield for( (label, versions) <- conflicts ) yield
label + ": " + versions.mkString(", ") label + ": " + versions.mkString(", ")
log.log(config.level, msg + conflictMsgs.mkString(msg, "\n ", "")) log.log(config.level, conflictMsgs.mkString(msg, "\n ", ""))
} }
if(config.failOnConflict && !conflicts.isEmpty) if(config.failOnConflict && !conflicts.isEmpty)
error("Conflicts in " + conflicts.map(_._1).mkString ) error("Conflicts in " + conflicts.map(_._1).mkString )