Only restoring environment variables that were deleted.

spectriclabs · Aug 26, 2024 · cca9010 · cca9010
1 parent 860fe2e
commit cca9010
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/xmextras/xm.py b/xmextras/xm.py
@@ -46,10 +46,12 @@ def XMSessionContext():
             finally:
                 session.end()
 
-                # Restore environment variables to their
-                # state from before the XMSession.
+                # Restore environment variables that were
+                # deleted during the XMSession.  Leave
+                # modified environment variables alone.
                 for k, v in saved_env_vars.items():
-                    os.environ[k] = v
+                    if k not in os.environ:
+                        os.environ[k] = v
 
         def info(session):
             '''