From c51e8a2ff832ddd46396e6c0bea1b209fb86ba9f Mon Sep 17 00:00:00 2001 From: dmharrah Date: Fri, 11 Sep 2009 19:26:41 +0000 Subject: [PATCH] Checks to ensure that Ivy attributes begin with 'e:' git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1002 d89573ee-9141-11dd-94d4-bdf5e562f29c --- src/main/scala/sbt/ManagedInterface.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala index 1880df9be..83a4376ea 100644 --- a/src/main/scala/sbt/ManagedInterface.scala +++ b/src/main/scala/sbt/ManagedInterface.scala @@ -64,7 +64,7 @@ final case class ModuleID(organization: String, name: String, revision: String, def from(url: String) = artifacts(Artifact(name, new URL(url))) def classifier(c: String) = artifacts(Artifact(name, c)) def artifacts(newArtifacts: Artifact*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, newArtifacts ++ explicitArtifacts, extraAttributes) - def extra(attributes: (String,String)*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, extraAttributes ++ attributes) + def extra(attributes: (String,String)*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, extraAttributes ++ ModuleID.checkE(attributes)) } object ModuleID { @@ -75,6 +75,10 @@ object ModuleID ModuleID(organization, name, revision, configurations, isChanging, isTransitive, Nil) def apply(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact]): ModuleID = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, Map.empty) + + def checkE(attributes: Seq[(String, String)]) = + for ( (key, value) <- attributes) yield + if(key.startsWith("e:")) (key, value) else ("e:" + key, value) } sealed trait Resolver extends NotNull {