diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-05-19 11:23:51 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-19 11:23:51 +0800 |
commit | 1cb439fce4af7a61166f13a3c5045fa7c73b25de (patch) | |
tree | 82f7d64e787e2871e973d895f20bfc0fe95df0f0 /main/src/main/RunScript.scala | |
parent | 64f477e36c33afe8dfd87a839ba263e9973b0669 (diff) | |
parent | 052af24a530f8bc0532b368a2d360ff30f67d7b8 (diff) | |
download | mill-1cb439fce4af7a61166f13a3c5045fa7c73b25de.tar.gz mill-1cb439fce4af7a61166f13a3c5045fa7c73b25de.tar.bz2 mill-1cb439fce4af7a61166f13a3c5045fa7c73b25de.zip |
Merge branch 'master' into docker
Diffstat (limited to 'main/src/main/RunScript.scala')
-rw-r--r-- | main/src/main/RunScript.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/src/main/RunScript.scala b/main/src/main/RunScript.scala index ea8e554f..ab53aa1a 100644 --- a/main/src/main/RunScript.scala +++ b/main/src/main/RunScript.scala @@ -30,9 +30,14 @@ object RunScript{ stateCache: Option[Evaluator.State], log: Logger, env : Map[String, String], - keepGoing: Boolean) + keepGoing: Boolean, + systemProperties: Map[String, String]) : (Res[(Evaluator, Seq[PathRef], Either[String, Seq[ujson.Value]])], Seq[(os.Path, Long)]) = { + systemProperties.foreach {case (k,v) => + System.setProperty(k, v) + } + val (evalState, interpWatched) = stateCache match{ case Some(s) if watchedSigUnchanged(s.watched) => Res.Success(s) -> s.watched case _ => |