diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2017-12-28 09:50:31 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-12-28 09:50:31 -0800 |
| commit | 8b39024ef427f670d42ca8ab57e618622a0fee54 (patch) | |
| tree | 92b0fe18a4949ff6756e28d957be7c48e8bb00c1 /core/src/main/scala/mill/main/MainRunner.scala | |
| parent | 02522c54bc94bb3799256173394d8af0821864a9 (diff) | |
| download | mill-8b39024ef427f670d42ca8ab57e618622a0fee54.tar.gz mill-8b39024ef427f670d42ca8ab57e618622a0fee54.tar.bz2 mill-8b39024ef427f670d42ca8ab57e618622a0fee54.zip | |
Properly propagate failures in task evaluation to the ammonite script runner
Diffstat (limited to 'core/src/main/scala/mill/main/MainRunner.scala')
| -rw-r--r-- | core/src/main/scala/mill/main/MainRunner.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/src/main/scala/mill/main/MainRunner.scala b/core/src/main/scala/mill/main/MainRunner.scala index fb0f3d7c..28d0a284 100644 --- a/core/src/main/scala/mill/main/MainRunner.scala +++ b/core/src/main/scala/mill/main/MainRunner.scala @@ -24,13 +24,14 @@ class MainRunner(config: ammonite.main.Cli.Config) mainCfg.instantiateInterpreter() match{ case Left(problems) => problems case Right(interp) => + val interpWatched = interp.watchedFiles + val result = RunScript.runScript( mainCfg.wd, scriptPath, interp, scriptArgs, lastEvaluator ) - - val interpWatched = interp.watchedFiles result match{ - case Res.Success((eval, evaluationWatches, success)) => + case Res.Success(data) => + val (eval, evaluationWatches) = data lastEvaluator = Some((interpWatched, eval)) (result, interpWatched ++ evaluationWatches) case _ => |