#2296: don't store XPRA_ALT_PYTHON_RETRY

git-svn-id: https://xpra.org/svn/Xpra/trunk@22716 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 15, 2019 · 4269bb1 · 4269bb1
1 parent 5764e11
commit 4269bb1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/xpra/server/server_util.py b/src/xpra/server/server_util.py
@@ -28,6 +28,11 @@ def xpra_runner_shell_script(xpra_file, starting_dir, socket_dir):
         #XPRA_SOCKET_DIR is a special case, it is handled below
         if var=="XPRA_SOCKET_DIR":
             continue
+        if var=="XPRA_ALT_PYTHON_RETRY":
+            #the environment might have changed,
+            #and we may need to retry with a different interpreter
+            #different from the one that created this script
+            continue
         if var.startswith("BASH_FUNC"):
             #some versions of bash will apparently generate functions
             #that cannot be reloaded using this script