Further hide _PEX_EXEC_CHAIN from production.

pex-tool · Jun 25, 2019 · 4efafc2 · 4efafc2
1 parent 1ece89c
commit 4efafc2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pex/pex_bootstrapper.py b/pex/pex_bootstrapper.py
@@ -116,12 +116,12 @@ def maybe_reexec_pex(compatibility_constraints=None):
 
   current_interpreter = PythonInterpreter.get()
 
-  # NB: Used only for debugging and tests.
-  pex_exec_chain = []
+  # NB: Used only for tests.
   if '_PEX_EXEC_CHAIN' in os.environ:
-    pex_exec_chain.extend(os.environ['_PEX_EXEC_CHAIN'].split(os.pathsep))
-  pex_exec_chain.append(current_interpreter.binary)
-  os.environ['_PEX_EXEC_CHAIN'] = os.pathsep.join(pex_exec_chain)
+    flag_or_chain = os.environ.pop('_PEX_EXEC_CHAIN')
+    pex_exec_chain = [] if flag_or_chain == '1' else flag_or_chain.split(os.pathsep)
+    pex_exec_chain.append(current_interpreter.binary)
+    os.environ['_PEX_EXEC_CHAIN'] = os.pathsep.join(pex_exec_chain)
 
   current_interpreter_blessed_env_var = '_PEX_SHOULD_EXIT_BOOTSTRAP_REEXEC'
   if os.environ.pop(current_interpreter_blessed_env_var, None):

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -1519,7 +1519,8 @@ def add_to_path(entry):
     result = run_pex_command(args, env=env)
     result.assert_success()
 
-    env = make_env(PEX_INTERPRETER=1,
+    env = make_env(_PEX_EXEC_CHAIN=1,
+                   PEX_INTERPRETER=1,
                    PEX_PYTHON=pex_python,
                    PEX_PYTHON_PATH=os.pathsep.join(pex_python_path) if pex_python_path else None)