[GR-14629] Fix execution of subprocesses on JVM inside a venv

PullRequest: graalpython/450

Author: timfel

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -394,10 +394,15 @@ protected void launch(Builder contextBuilder) {
             unbufferedIO = unbufferedIO || System.getenv("PYTHONUNBUFFERED") != null;
         }
 
-        // The unlikely separator is used because options need to be strings. See
-        // PythonOptions.getExecutableList()
-        contextBuilder.option("python.ExecutableList", String.join("🏆", getExecutableList()));
-        setContextOptionIfUnset(contextBuilder, "python.Executable", getExecutable());
+        String executable = getContextOptionIfSetViaCommandLine("python.Executable");
+        if (executable != null) {
+            contextBuilder.option("python.ExecutableList", executable);
+        } else {
+            contextBuilder.option("python.Executable", getExecutable());
+            // The unlikely separator is used because options need to be
+            // strings. See PythonOptions.getExecutableList()
+            contextBuilder.option("python.ExecutableList", String.join("🏆", getExecutableList()));
+        }
 
         // setting this to make sure our TopLevelExceptionHandler calls the excepthook
         // to print Python exceptions
@@ -471,16 +476,21 @@ protected void launch(Builder contextBuilder) {
         System.exit(rc);
     }
 
-    private void setContextOptionIfUnset(Builder contextBuilder, String key, String value) {
+    private String getContextOptionIfSetViaCommandLine(String key) {
         if (System.getProperty("polyglot." + key) != null) {
-            return;
+            return System.getProperty("polyglot." + key);
         }
         for (String f : givenArguments) {
             if (f.startsWith("--" + key)) {
-                return;
+                String[] splits = f.split("=", 2);
+                if (splits.length > 1) {
+                    return splits[1];
+                } else {
+                    return "true";
+                }
             }
         }
-        contextBuilder.option(key, value);
+        return null;
     }
 
     private static void printFileNotFoundException(NoSuchFileException e) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -31,8 +31,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
-import org.graalvm.options.OptionDescriptors;
-
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
@@ -91,6 +89,8 @@
 import com.oracle.truffle.api.source.Source.SourceBuilder;
 import com.oracle.truffle.api.source.SourceSection;
 
+import org.graalvm.options.OptionDescriptors;
+
 @TruffleLanguage.Registration(id = PythonLanguage.ID, name = PythonLanguage.NAME, version = PythonLanguage.VERSION, characterMimeTypes = PythonLanguage.MIME_TYPE, interactive = true, internal = false, contextPolicy = TruffleLanguage.ContextPolicy.SHARED)
 @ProvidedTags({StandardTags.CallTag.class, StandardTags.StatementTag.class, StandardTags.RootTag.class, StandardTags.TryBlockTag.class, StandardTags.ExpressionTag.class,
                 DebuggerTags.AlwaysHalt.class})
@@ -218,7 +218,8 @@ private void ensureHomeInOptions(Env env) {
                             "\n\tSysPrefix: {1}" +
                             "\n\tSysBasePrefix: {2}" +
                             "\n\tCoreHome: {3}" +
-                            "\n\tStdLibHome: {4}", home.getPath(), sysPrefix, basePrefix, coreHome, stdLibHome)));
+                            "\n\tStdLibHome: {4}" +
+                            "\n\tExecutable: {5}", home.getPath(), sysPrefix, basePrefix, coreHome, stdLibHome, env.getOptions().get(PythonOptions.Executable))));
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -66,12 +66,14 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -135,7 +137,6 @@
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.sun.security.auth.UnixNumericGroupPrincipal;
 import com.sun.security.auth.UnixNumericUserPrincipal;
-import java.util.Locale;
 
 @CoreFunctions(defineModule = "posix")
 public class PosixModuleBuiltins extends PythonBuiltins {
@@ -1340,6 +1341,7 @@ int system(String cmd) {
             if (!context.isExecutableAccessAllowed()) {
                 return -1;
             }
+            PythonLanguage.getLogger().fine(() -> "os.system: " + cmd);
             String[] command = new String[]{shell[0], shell[1], cmd};
             Env env = context.getEnv();
             try {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixSubprocessModuleBuiltins.java

@@ -51,8 +51,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.nativeimage.ImageInfo;
-
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -77,6 +76,8 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 
+import org.graalvm.nativeimage.ImageInfo;
+
 @CoreFunctions(defineModule = "_posixsubprocess")
 public class PosixSubprocessModuleBuiltins extends PythonBuiltins {
     @Override
@@ -129,6 +130,7 @@ synchronized int forkExec(PList args, @SuppressWarnings("unused") PList execList
                 }
             }
 
+            PythonLanguage.getLogger().fine(() -> "_posixsubprocess.fork_exec: " + String.join(" ", argStrings));
             ProcessBuilder pb = new ProcessBuilder(argStrings);
             if (p2cread != -1 && p2cwrite != -1) {
                 pb.redirectInput(Redirect.PIPE);