luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100 from alexarchambault/topic/fix 

Fix
This commit is contained in:
Alexandre Archambault 2016-01-05 10:32:57 +01:00
parent 27ac8cb233 8180e09fcd
commit 8527630e8e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/shared/src/main/scala/coursier/ivy/IvyXml.scala
View File

@ -52,9 +52,9 @@ object IvyXml {
val excludes = node.children
.filter(_.label == "exclude")
.flatMap { node0 =>
val org = node.attribute("org").getOrElse("*")
val name = node.attribute("module").orElse(node.attribute("name")).getOrElse("*")
val confs = node.attribute("conf").toOption.fold(Seq("*"))(_.split(','))
val org = node0.attribute("org").getOrElse("*")
val name = node0.attribute("module").orElse(node0.attribute("name")).getOrElse("*")
val confs = node0.attribute("conf").toOption.filter(_.nonEmpty).fold(Seq("*"))(_.split(','))
confs.map(_ -> (org, name))
}
.groupBy { case (conf, _) => conf }
@ -177,4 +177,4 @@ object IvyXml {
)
}
}
}