purge GRAAL_PYTHON_ARGS only if it ends with \v, because we're already using this to pass things to subprocesses

(cherry picked from commit d6371f1)

Author: timfel

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

@@ -964,7 +964,8 @@ protected void printHelp(OptionCategory maxCategory) {
                         "   commandline. Arguments are split on whitespace - you can use \" and/or ' as required to\n" +
                         "   group them. Alternatively, if the value starts with a vertical tab character, the entire\n" +
                         "   value is split at vertical tabs and the elements are used as arguments without any further\n" +
-                        "   escaping.\n" +
+                        "   escaping. If the value ends with a vertical tab, it is also purged from the environment\n" +
+                        "   when the interpreter runs, so that GraalPy subprocess will not pick it up\n" +
                         "   There are two special substitutions for this variable: any `$$' in the value is replaced\n" +
                         "   with the current process id, and any $UUID$ is replaced with random unique string\n" +
                         "   that may contain letters, digits, and '-'. To pass a literal `$$', you must escape the\n" +

graalpython/com.oracle.graal.python.test/src/tests/test_subprocess.py

@@ -169,3 +169,14 @@ def test_graal_python_args(self):
             env = {"GRAAL_PYTHON_ARGS": """\v-c\vprint('Hello', "world")"""}
             result = subprocess.check_output([sys.executable], env=env, text=True)
             assert result == 'Hello world\n'
+
+            # check that the subprocess receives the args and thus it should fail because it recurses
+            args = """\v-c\vimport os\nprint(os.environ.get("GRAAL_PYTHON_ARGS"))"""
+            env = {"GRAAL_PYTHON_ARGS": args}
+            result = subprocess.check_output([sys.executable], env=env, text=True)
+            assert result == f"{args}\n"
+
+            # check that the subprocess does not receive the args when we end with \v
+            env = {"GRAAL_PYTHON_ARGS": """\v-c\vimport os\nprint(os.environ.get("GRAAL_PYTHON_ARGS"))\v"""}
+            result = subprocess.check_output([sys.executable], env=env, text=True, timeout=10)
+            assert result == 'None\n'

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

@@ -314,7 +314,7 @@ public void postInitialize(Python3Core core) {
         PDict environ = core.factory().createDict();
         String pyenvLauncherKey = "__PYVENV_LAUNCHER__";
         for (Entry<String, String> entry : getenv.entrySet()) {
-            if (entry.getKey().equals("GRAAL_PYTHON_ARGS")) {
+            if (entry.getKey().equals("GRAAL_PYTHON_ARGS") && entry.getValue().endsWith("\013")) {
                 // was already processed at startup in GraalPythonMain and
                 // we don't want subprocesses to pick it up
                 continue;

graalpython/lib-graalpython/modules/standalone/app/graalpy.sh

@@ -62,6 +62,5 @@ for var in "$@"; do
 done
 
 curdir=`pwd`
-export GRAAL_PYTHON_ARGS=$args
-echo graalpy.sh is going to execute: mvn -f "${location}/pom.xml" exec:exec -Dexec.executable=$JAVA -Dexec.workingdir="${curdir}" -Dexec.args="--module-path %classpath '-Dorg.graalvm.launcher.executablename=$0' --module org.graalvm.py.launcher/com.oracle.graal.python.shell.GraalPythonMain"
+export GRAAL_PYTHON_ARGS="${args}$(printf "\v")"
 mvn -f "${location}/pom.xml" exec:exec -Dexec.executable="${JAVA}" -Dexec.workingdir="${curdir}" -Dexec.args="--module-path %classpath '-Dorg.graalvm.launcher.executablename=$0' --module org.graalvm.py.launcher/com.oracle.graal.python.shell.GraalPythonMain"