From 1e762bcc9a62cd60d2f096fcb2810821e0af2ec5 Mon Sep 17 00:00:00 2001 From: Guanzhong Chen Date: Fri, 11 Oct 2019 00:24:35 -0400 Subject: [PATCH 1/2] Use bootclasspath in SCALA autoconf --- dmoj/executors/SCALA.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmoj/executors/SCALA.py b/dmoj/executors/SCALA.py index a0973fa1a..8b757158b 100644 --- a/dmoj/executors/SCALA.py +++ b/dmoj/executors/SCALA.py @@ -56,7 +56,7 @@ def autoconfig(cls): scala = result.pop('scala') with open(os.devnull, 'w') as devnull: - process = subprocess.Popen(['bash', '-x', scala, '-version'], stdout=devnull, stderr=subprocess.PIPE) + process = subprocess.Popen(['bash', '-x', scala, '-usebootcp', '-version'], stdout=devnull, stderr=subprocess.PIPE) output = utf8text(process.communicate()[1]) log = [i for i in output.split('\n') if 'scala.tools.nsc.MainGenericRunner' in i] From 8fcfa34a055b203194a78c03200ecc30de42d1e2 Mon Sep 17 00:00:00 2001 From: Guanzhong Chen Date: Fri, 11 Oct 2019 00:28:09 -0400 Subject: [PATCH 2/2] Update SCALA.py --- dmoj/executors/SCALA.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dmoj/executors/SCALA.py b/dmoj/executors/SCALA.py index 8b757158b..9b119a3c6 100644 --- a/dmoj/executors/SCALA.py +++ b/dmoj/executors/SCALA.py @@ -56,7 +56,8 @@ def autoconfig(cls): scala = result.pop('scala') with open(os.devnull, 'w') as devnull: - process = subprocess.Popen(['bash', '-x', scala, '-usebootcp', '-version'], stdout=devnull, stderr=subprocess.PIPE) + process = subprocess.Popen(['bash', '-x', scala, '-usebootcp', '-version'], + stdout=devnull, stderr=subprocess.PIPE) output = utf8text(process.communicate()[1]) log = [i for i in output.split('\n') if 'scala.tools.nsc.MainGenericRunner' in i]