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

Merge pull request #5877 from eatkins/shutdown-interrupt 

Catch interrupted exception in shell
This commit is contained in:
eugene yokota 2020-09-21 12:21:05 -04:00 committed by GitHub
parent 350f5497c6 ca251eb7c8
commit 56cca22baf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main/src/main/scala/sbt/Main.scala
View File

@ -1041,17 +1041,19 @@ object BuiltinCommands {
.extract(s1) .extract(s1)
.getOpt(Keys.minForcegcInterval) .getOpt(Keys.minForcegcInterval)
.getOrElse(GCUtil.defaultMinForcegcInterval) .getOrElse(GCUtil.defaultMinForcegcInterval)
val exec: Exec = getExec(s1, minGCInterval) try {
val newState = s1 val exec: Exec = getExec(s1, minGCInterval)
.copy( val newState = s1
onFailure = Some(Exec(Shell, None)), .copy(
remainingCommands = exec +: Exec(Shell, None) +: s1.remainingCommands onFailure = Some(Exec(Shell, None)),
) remainingCommands = exec +: Exec(Shell, None) +: s1.remainingCommands
.setInteractive(true) )
val res = .setInteractive(true)
if (exec.commandLine.trim.isEmpty) newState val res =
else newState.clearGlobalLog if (exec.commandLine.trim.isEmpty) newState
res else newState.clearGlobalLog
res
} catch { case _: InterruptedException => s1.exit(true) }
} }
} }