From e96488f628403f0cc241cca9986abd558cfb43af Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Mon, 2 Oct 2017 12:07:01 +0200
Subject: [PATCH] use correct exit code in RCommand.readEvalPrint upon call to
"quit"
---
.../src/com/oracle/truffle/r/launcher/RCommand.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCommand.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCommand.java
index dc891a9400..901c6bff41 100644
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCommand.java
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCommand.java
@@ -296,7 +296,8 @@ public class RCommand {
context.eval(QUIT_EOF);
} catch (PolyglotException e2) {
if (e2.isExit()) {
- return e2.getExitStatus();
+ // don't use the exit code from the PolyglotException
+ return lastStatus;
}
throw fatal(e, "error while calling quit");
}
--
GitLab