aboutsummaryrefslogtreecommitdiff
path: root/stage2/Stage2.scala
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-02-09 22:41:00 -0500
committerChristopher Vogt <oss.nsp@cvogt.org>2017-02-09 22:58:10 -0500
commitc293f196d8555fa446b1276eb21857093a7ccefd (patch)
tree510ec809f4b48bb1bbb5769977634e6680e78ee3 /stage2/Stage2.scala
parentf42d50ab33a829322618181375cb6c5f2e71118a (diff)
downloadcbt-c293f196d8555fa446b1276eb21857093a7ccefd.tar.gz
cbt-c293f196d8555fa446b1276eb21857093a7ccefd.tar.bz2
cbt-c293f196d8555fa446b1276eb21857093a7ccefd.zip
let Stage1 handle Stage2 exit code
Diffstat (limited to 'stage2/Stage2.scala')
-rw-r--r--stage2/Stage2.scala7
1 files changed, 5 insertions, 2 deletions
diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala
index 542a982..0f5b557 100644
--- a/stage2/Stage2.scala
+++ b/stage2/Stage2.scala
@@ -7,7 +7,7 @@ object Stage2 extends Stage2Base{
new Lib( context.logger ).loadRoot( context ).finalBuild
}
- def run( args: Stage2Args ): Unit = {
+ def run( args: Stage2Args ): ExitCode = {
import args.logger
val paths = CbtPaths(args.cbtHome,args.cache)
import paths._
@@ -75,10 +75,13 @@ object Stage2 extends Stage2Base{
logger.loop(s"Re-running $task for " ++ build.show)
call(build)
}
+ ExitCode.Success
} else {
val code = call(build)
logger.stage2(s"Stage2 end")
- System.exit(code.integer)
+ code
}
+
+ res
}
}