[Checkins] SVN: zc.buildout/trunk/ Removed a workaround for a bug that was fixed in setuptools 0.6b3.

Jim Fulton jim at zope.com
Fri Jun 9 17:32:27 EDT 2006


Log message for revision 68552:
  Removed a workaround for a bug that was fixed in setuptools 0.6b3.
  

Changed:
  U   zc.buildout/trunk/eggrecipe/src/zc/recipe/egg/egg.py
  U   zc.buildout/trunk/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/trunk/eggrecipe/src/zc/recipe/egg/egg.py
===================================================================
--- zc.buildout/trunk/eggrecipe/src/zc/recipe/egg/egg.py	2006-06-09 21:32:24 UTC (rev 68551)
+++ zc.buildout/trunk/eggrecipe/src/zc/recipe/egg/egg.py	2006-06-09 21:32:26 UTC (rev 68552)
@@ -42,7 +42,6 @@
             distribution,
             buildout.eggs,
             [buildout.buildout_path(link) for link in links],
-            always_copy = True,
             )
 
         scripts = self.options.get('scripts')

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py	2006-06-09 21:32:24 UTC (rev 68551)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py	2006-06-09 21:32:26 UTC (rev 68552)
@@ -46,11 +46,6 @@
         )
     easy.finalize_options()
 
-    # hack around easy_install bug 
-    easy.local_index = pkg_resources.Environment(
-        easy.shadow_path + sys.path)
-
-
     old_warn = distutils.log.warn
     distutils.log.warn = lambda *a, **k: None
 



More information about the Checkins mailing list