From 0e313b1ee8e4bd12f051e5a461527c82c4b9bdb4 Mon Sep 17 00:00:00 2001 From: Jim Fulton <jim@zope.com> Date: Fri, 9 Jun 2006 21:32:26 +0000 Subject: [PATCH] Removed a workaround for a bug that was fixed in setuptools 0.6b3. --- eggrecipe/src/zc/recipe/egg/egg.py | 1 - src/zc/buildout/easy_install.py | 5 ----- 2 files changed, 6 deletions(-) diff --git a/eggrecipe/src/zc/recipe/egg/egg.py b/eggrecipe/src/zc/recipe/egg/egg.py index 5f69372..86c7b77 100644 --- a/eggrecipe/src/zc/recipe/egg/egg.py +++ b/eggrecipe/src/zc/recipe/egg/egg.py @@ -42,7 +42,6 @@ class Egg: distribution, buildout.eggs, [buildout.buildout_path(link) for link in links], - always_copy = True, ) scripts = self.options.get('scripts') diff --git a/src/zc/buildout/easy_install.py b/src/zc/buildout/easy_install.py index 3896770..c8b9e10 100644 --- a/src/zc/buildout/easy_install.py +++ b/src/zc/buildout/easy_install.py @@ -46,11 +46,6 @@ def install(spec, dest, links=(), **kw): ) 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 -- 2.30.9