luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1245 from sbt/fix/infinite-loop 

Fix infinite loop of death.
This commit is contained in:
Josh Suereth 2014-04-09 12:54:29 -04:00
parent 78d2aabda2 43c25beeed
commit 852d6e2f80
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/scala/sbt/EvaluateTask.scala
View File

@ -99,11 +99,15 @@ final object EvaluateTaskConfig {
checkCycles: Boolean, checkCycles: Boolean,
progressReporter: ExecuteProgress[Task], progressReporter: ExecuteProgress[Task],
cancelStrategy: TaskCancellationStrategy): EvaluateTaskConfig = { cancelStrategy: TaskCancellationStrategy): EvaluateTaskConfig = {
val r = restrictions
val check = checkCycles
val cs = cancelStrategy
val pr = progressReporter
object SimpleEvaluateTaskConfig extends EvaluateTaskConfig { object SimpleEvaluateTaskConfig extends EvaluateTaskConfig {
def restrictions = restrictions def restrictions = r
def checkCycles = checkCycles def checkCycles = check
def progressReporter = progressReporter def progressReporter = pr
def cancelStrategy = cancelStrategy def cancelStrategy = cs
} }
SimpleEvaluateTaskConfig SimpleEvaluateTaskConfig
} }