diff options
| author | PJ Eby <distutils-sig@python.org> | 2008-01-19 02:55:03 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2008-01-19 02:55:03 +0000 |
| commit | 60cf2d31c8edb39b418f522ad935320c6da9c927 (patch) | |
| tree | 0b107df453c60f90e6159d58aa56cc2bfcf28225 /setuptools/command/install.py | |
| parent | 7c4938d53774c51b441970e177ce72cc3bdf68ce (diff) | |
| download | python-setuptools-git-60cf2d31c8edb39b418f522ad935320c6da9c927.tar.gz | |
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
Diffstat (limited to 'setuptools/command/install.py')
| -rw-r--r-- | setuptools/command/install.py | 10 |
1 files changed, 5 insertions, 5 deletions
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] @@ -116,8 +120,4 @@ class install(_install): - - - - # |