From eedc93c423808d8762bcf8d752201cfcf0afbc6d Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 16 Jul 2011 12:53:29 -0400 Subject: [PATCH] provide better indication of cause of incompatible sbt versions --- ivy/ConflictWarning.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ivy/ConflictWarning.scala b/ivy/ConflictWarning.scala index f61f0f51f..758ebb07a 100644 --- a/ivy/ConflictWarning.scala +++ b/ivy/ConflictWarning.scala @@ -2,16 +2,16 @@ package sbt import DependencyFilter._ -final case class ConflictWarning(filter: ModuleFilter, group: ModuleID => String, level: Level.Value, failOnConflict: Boolean) +final case class ConflictWarning(label: String, filter: ModuleFilter, group: ModuleID => String, level: Level.Value, failOnConflict: Boolean) object ConflictWarning { - lazy val default: ConflictWarning = ConflictWarning( moduleFilter(organization = GlobFilter("org.scala-tools.sbt") | GlobFilter("org.scala-lang")), (_: ModuleID).organization, Level.Warn, false) + def default(label: String): ConflictWarning = ConflictWarning(label, moduleFilter(organization = GlobFilter("org.scala-tools.sbt") | GlobFilter("org.scala-lang")), (_: ModuleID).organization, Level.Warn, false) def apply(config: ConflictWarning, report: UpdateReport, log: Logger) { val conflicts = IvyActions.groupedConflicts(config.filter, config.group)(report) if(!conflicts.isEmpty) - log.log(config.level, "Potentially incompatible versions specified:") + log.log(config.level, "Potentially incompatible versions specified by " + config.label + ":") for( (label, versions) <- conflicts ) log.log(config.level, " " + label + ": " + versions.mkString(", ")) if(config.failOnConflict && !conflicts.isEmpty)