Don't pollute the environment with OVM details (_OVM_*).

Python-2.7.13/Modules/main.c

@@ -334,7 +334,6 @@ Ovm_Main(int argc, char **argv)
     cf.cf_flags = 0;
 
     setenv("_OVM_IS_BUNDLE", "1", 1);  // for .zip resources
-    setenv("_OVM_DEPS", "1", 1);  // for debug imports
 
     // Communicate C build configuration to Python env.
     // TODO: Could rename back to _OVM_HAVE_READLINE.

core/process.py

@@ -378,6 +378,7 @@ def Exec(self, argv, environ):
               line.startswith('#!/usr/bin/env bash')):
             log('Running %s with OSH', argv)
             argv = ['/usr/local/bin/osh'] + argv
+            #argv = ['python', '/home/andy/git/oilshell/oil/bin/oil.py', 'osh'] + argv
           else:
             log('%s has line %r', argv, line)
         finally:

core/util.py

@@ -209,11 +209,17 @@ def GetResourceLoader():
   # Ovm_Main in main.c sets this.
   if posix.environ.get('_OVM_IS_BUNDLE') == '1':
     ovm_path = posix.environ.get('_OVM_PATH')
-    #log('! OVM_PATH = %s', ovm_path)
     _loader = _ZipResourceLoader(ovm_path)
+
+    # Now clear them so we don't pollute the environment.  In Python, this
+    # calls unsetenv().
+    del posix.environ['_OVM_IS_BUNDLE']
+    del posix.environ['_OVM_PATH']
+
   elif posix.environ.get('_OVM_RESOURCE_ROOT'):  # Unit tests set this
     root_dir = posix.environ.get('_OVM_RESOURCE_ROOT')
     _loader = _FileResourceLoader(root_dir)
+
   else:
     # NOTE: This assumes all unit tests are one directory deep, e.g.
     # core/util_test.py.

spec/command_.test.sh

@@ -20,3 +20,10 @@ $TMP/not-a-dir/text-file
 ## status: 127
 ## OK dash status: 2
 ## OK bash status: 126
+
+#### External programs don't have _OVM in environment
+# bug fix for leakage
+env | grep _OVM
+echo status=$?
+## stdout: status=1
+