From 60cf2d31c8edb39b418f522ad935320c6da9c927 Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Sat, 19 Jan 2008 02:55:03 +0000 Subject: Fix interactions between the various "require" options, so that downloads aren't repeated and needed eggs are always installed, even if they were downloaded to the setup directory already. (backport from trunk) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4060066 --- setuptools/command/install.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'setuptools/command/install.py') diff --git a/setuptools/command/install.py b/setuptools/command/install.py index 1de38aba..a150c435 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py @@ -1,4 +1,4 @@ -import setuptools, sys +import setuptools, sys, glob from distutils.command.install import install as _install from distutils.errors import DistutilsArgError @@ -88,6 +88,10 @@ class install(_install): self.distribution, args="x", root=self.root, record=self.record, ) cmd.ensure_finalized() # finalize before bdist_egg munges install cmd + cmd.always_copy_from = '.' # make sure local-dir eggs get installed + + # pick up setup-dir .egg files only: no .egg-info + cmd.package_index.scan(glob.glob('*.egg')) self.run_command('bdist_egg') args = [self.distribution.get_command_obj('bdist_egg').egg_output] @@ -115,9 +119,5 @@ class install(_install): - - - - # -- cgit v1.2.3