Fix pattern match on buildLoaders.

Fixes #1341
sbt · May 16, 2014 · e95fecc · e95fecc
1 parent d509ff8
commit e95fecc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/main/src/main/scala/sbt/Load.scala b/main/src/main/scala/sbt/Load.scala
@@ -270,7 +270,7 @@ object Load
 		loaders updatePluginManagement PluginManagement.extractOverrides(unit.plugins.fullClasspath)
 
 	def addResolvers(unit: sbt.BuildUnit, isRoot: Boolean, loaders: BuildLoader): BuildLoader =
-		unit.definitions.builds.flatMap(_.buildLoaders) match
+		unit.definitions.builds.flatMap(_.buildLoaders).toList match
 		{
 			case Nil => loaders
 			case x :: xs =>

diff --git a/sbt/src/sbt-test/project/build-loaders/project/build.scala b/sbt/src/sbt-test/project/build-loaders/project/build.scala
@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object EmptyLoaderBuild extends Build {
+  override def buildLoaders = BuildLoader.transform(_.unit) :: Nil
+  lazy val root = (
+    project in file(".")
+    settings(
+      name := "foo"
+    )
+  )
+}
diff --git a/sbt/src/sbt-test/project/build-loaders/test b/sbt/src/sbt-test/project/build-loaders/test
@@ -0,0 +1,2 @@
+# Just making sure the build compiles is enough of a test.
+> name