[Checkins] SVN: zc.buildout/branches/gary-support-system-python/src/zc/buildout/easy_install.py a basic fix so that developing an egg follows the same rules that the main bin/buildout script follows. This makes it possible to have `include-site-packages=false` fix problems during development.

Gary Poster gary.poster at canonical.com
Thu Jul 16 15:30:41 EDT 2009


Log message for revision 101950:
  a basic fix so that developing an egg follows the same rules that the main bin/buildout script follows.  This makes it possible to have `include-site-packages=false` fix problems during development.

Changed:
  U   zc.buildout/branches/gary-support-system-python/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/branches/gary-support-system-python/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-support-system-python/src/zc/buildout/easy_install.py	2009-07-16 19:27:13 UTC (rev 101949)
+++ zc.buildout/branches/gary-support-system-python/src/zc/buildout/easy_install.py	2009-07-16 19:30:41 UTC (rev 101950)
@@ -974,7 +974,7 @@
         undo.append(lambda: os.close(fd))
 
         os.write(fd, runsetup_template % dict(
-            setuptools=setuptools_loc,
+            sys_path=',\n    '.join(repr(p) for p in sys.path),
             setupdir=directory,
             setup=setup,
             __file__ = setup,
@@ -1330,8 +1330,10 @@
 
 runsetup_template = """
 import sys
-sys.path.insert(0, %(setupdir)r)
-sys.path.insert(0, %(setuptools)r)
+sys.path[:] = [
+    %(setupdir)r,
+    %(sys_path)s
+    ]
 import os, setuptools
 
 __file__ = %(__file__)r



More information about the Checkins mailing list