From b73873c2ce394ad8be08af03fcf41efc0338c291 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Fri, 29 Apr 2016 01:30:20 -0400 Subject: fix exit code return --- stage2/Stage2.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala index 83b660e..417808d 100644 --- a/stage2/Stage2.scala +++ b/stage2/Stage2.scala @@ -52,13 +52,13 @@ object Stage2 extends Stage2Base{ val first = lib.loadRoot( context ) val build = first.finalBuild - def call(build: BuildInterface) = { + def call(build: BuildInterface): ExitCode = { if(cross){ - build.crossScalaVersions.foreach{ + build.crossScalaVersions.map{ v => new lib.ReflectBuild( build.copy(context.copy(scalaVersion = Some(v))) ).callNullary(task) - } + }.filter(_ != ExitCode.Success).headOption getOrElse ExitCode.Success } else { new lib.ReflectBuild(build).callNullary(task) } @@ -85,9 +85,9 @@ object Stage2 extends Stage2Base{ call(build) } } else { - call(build) + val code = call(build) + logger.stage2(s"Stage2 end") + System.exit(code.integer) } - - logger.stage2(s"Stage2 end") } } -- cgit v1.2.3