[Checkins] SVN: zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install. another small tweak for mimicing site.py.

[Gary Poster]

Log message for revision 115847:
  another small tweak for mimicing site.py.

Changed:
  U   zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py
  U   zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.txt

-=-
Modified: zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py	2010-08-20 16:34:28 UTC (rev 115846)
+++ zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py	2010-08-20 20:02:53 UTC (rev 115847)
@@ -1650,6 +1650,8 @@
             original_path_setup = (
                 addsitedir_namespace_originalpackages_snippet +
                 original_path_setup)
+        else:
+            preamble = '\n    setuptools_path = None'
     egg_path_string, relative_preamble = _relative_path_and_setup(
         site_path, path, relative_paths, indent_level=2, omit_os_import=True)
     if relative_preamble:
@@ -1699,7 +1701,7 @@
         %s
         ]
     for path in original_paths:
-        if path not in known_paths:
+        if path == setuptools_path or path not in known_paths:
             addsitedir(path, known_paths)'''
 
 addsitepackages_script = '''\

Modified: zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.txt	2010-08-20 16:34:28 UTC (rev 115846)
+++ zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.txt	2010-08-20 20:02:53 UTC (rev 115847)
@@ -1277,6 +1277,7 @@
         """Add site packages, as determined by zc.buildout.
     <BLANKLINE>
         See original_addsitepackages, below, for the original version."""
+        setuptools_path = None
         buildout_paths = [
             '/interpreter/eggs/demo-0.3-pyN.N.egg',
             '/interpreter/eggs/demoneeded-1.1-pyN.N.egg'
@@ -1291,7 +1292,7 @@
             ...
             ]
         for path in original_paths:
-            if path not in known_paths:
+            if path == setuptools_path or path not in known_paths:
                 addsitedir(path, known_paths)
         return known_paths
     <BLANKLINE>
@@ -1369,7 +1370,7 @@
             ...
             ]
         for path in original_paths:
-            if path not in known_paths:
+            if path == setuptools_path or path not in known_paths:
                 addsitedir(path, known_paths)
         return known_paths
     <BLANKLINE>
@@ -1434,7 +1435,7 @@
             ...
             ]
         for path in original_paths:
-            if path not in known_paths:
+            if path == setuptools_path or path not in known_paths:
                 addsitedir(path, known_paths)
         return known_paths
     <BLANKLINE>