[Checkins] SVN: zc.buildout/trunk/ Scripts store the old PYTHONPATH in BUILDOUT_ORIGINAL_PYTHONPATH if it existed

[Gary Poster]

Log message for revision 116009:
  Scripts store the old PYTHONPATH in BUILDOUT_ORIGINAL_PYTHONPATH if it existed

Changed:
  U   zc.buildout/trunk/CHANGES.txt
  U   zc.buildout/trunk/src/zc/buildout/bootstrap.txt
  U   zc.buildout/trunk/src/zc/buildout/buildout.txt
  U   zc.buildout/trunk/src/zc/buildout/easy_install.py
  U   zc.buildout/trunk/src/zc/buildout/easy_install.txt

-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt	2010-08-29 19:49:54 UTC (rev 116008)
+++ zc.buildout/trunk/CHANGES.txt	2010-08-29 20:46:38 UTC (rev 116009)
@@ -4,6 +4,13 @@
 1.5.1 (unreleased)
 ==================
 
+New features:
+
+- Scripts store the old PYTHONPATH in BUILDOUT_ORIGINAL_PYTHONPATH if it
+  existed, and store nothing in the value if it did not exist.  This allows
+  recipes that do not want subprocesses to have the system-Python-protected
+  site.py to set the environment of the subprocess appropriately.
+
 Bugs fixed:
 
 - https://bugs.launchpad.net/bugs/623590 : If include-site-packages were

Modified: zc.buildout/trunk/src/zc/buildout/bootstrap.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/bootstrap.txt	2010-08-29 19:49:54 UTC (rev 116008)
+++ zc.buildout/trunk/src/zc/buildout/bootstrap.txt	2010-08-29 20:46:38 UTC (rev 116009)
@@ -65,6 +65,7 @@
     import os
     path = sys.path[0]
     if os.environ.get('PYTHONPATH'):
+        os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
         path = os.pathsep.join([path, os.environ['PYTHONPATH']])
     os.environ['PYTHONPATH'] = path
     import site # imports custom buildout-generated site.py

Modified: zc.buildout/trunk/src/zc/buildout/buildout.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.txt	2010-08-29 19:49:54 UTC (rev 116008)
+++ zc.buildout/trunk/src/zc/buildout/buildout.txt	2010-08-29 20:46:38 UTC (rev 116009)
@@ -2421,6 +2421,7 @@
     import os
     path = sys.path[0]
     if os.environ.get('PYTHONPATH'):
+        os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
         path = os.pathsep.join([path, os.environ['PYTHONPATH']])
     os.environ['PYTHONPATH'] = path
     import site # imports custom buildout-generated site.py

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py	2010-08-29 19:49:54 UTC (rev 116008)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py	2010-08-29 20:46:38 UTC (rev 116009)
@@ -1287,6 +1287,7 @@
 import os
 path = sys.path[0]
 if os.environ.get('PYTHONPATH'):
+    os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
     path = os.pathsep.join([path, os.environ['PYTHONPATH']])
 os.environ['PYTHONPATH'] = path
 import site # imports custom buildout-generated site.py

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.txt	2010-08-29 19:49:54 UTC (rev 116008)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.txt	2010-08-29 20:46:38 UTC (rev 116009)
@@ -1510,6 +1510,7 @@
     import os
     path = sys.path[0]
     if os.environ.get('PYTHONPATH'):
+        os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
         path = os.pathsep.join([path, os.environ['PYTHONPATH']])
     os.environ['PYTHONPATH'] = path
     import site # imports custom buildout-generated site.py
@@ -1554,6 +1555,7 @@
     import os
     path = sys.path[0]
     if os.environ.get('PYTHONPATH'):
+        os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
         path = os.pathsep.join([path, os.environ['PYTHONPATH']])
     os.environ['PYTHONPATH'] = path
     import site # imports custom buildout-generated site.py