[svn] commit: r1689 - /trunk/src/bin/bind10/bind10.py.in

[BIND 10 source code commits]

Author: jinmei
Date: Wed Apr  7 22:41:55 2010
New Revision: 1689

Log:
Environment variables for the child process will be a copy of those
of the boss process with any additional specific variables given
on construction (self.env) of ProcessInfo.

Modified:
    trunk/src/bin/bind10/bind10.py.in

Modified: trunk/src/bin/bind10/bind10.py.in
==============================================================================
--- trunk/src/bin/bind10/bind10.py.in (original)
+++ trunk/src/bin/bind10/bind10.py.in Wed Apr  7 22:41:55 2010
@@ -108,16 +108,13 @@
             spawn_stdout = self.dev_null
         else:
             spawn_stdout = None
-        spawn_env = self.env
-        spawn_env['PATH'] = os.environ['PATH']
-        if 'B10_FROM_SOURCE' in os.environ:
-            spawn_env['B10_FROM_SOURCE'] = os.environ['B10_FROM_SOURCE']
-        else: 
+        # Environment variables for the child process will be a copy of those
+        # of the boss process with any additional specific variables given
+        # on construction (self.env).
+        spawn_env = os.environ
+        spawn_env.update(self.env)
+        if not 'B10_FROM_SOURCE' in os.environ:
             spawn_env['PATH'] = "@@LIBEXECDIR@@:" + spawn_env['PATH']
-        if 'PYTHON_EXEC' in os.environ:
-            spawn_env['PYTHON_EXEC'] = os.environ['PYTHON_EXEC']
-        if 'PYTHONPATH' in os.environ:
-            spawn_env['PYTHONPATH'] = os.environ['PYTHONPATH']
         self.process = subprocess.Popen(self.args,
                                         stdin=subprocess.PIPE,
                                         stdout=spawn_stdout,