diff options
| author | PJ Eby <distutils-sig@python.org> | 2005-07-10 04:49:31 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2005-07-10 04:49:31 +0000 |
| commit | 451377d0e877fc610d1bdf8181ba70a90e4c14cc (patch) | |
| tree | 89e0ecc02b8040a747eee92971c0166e63e9e6b2 /setuptools/dist.py | |
| parent | 74f597fec6a91b8305177461e7c25bb231999e61 (diff) | |
| download | external_python_setuptools-451377d0e877fc610d1bdf8181ba70a90e4c14cc.tar.gz external_python_setuptools-451377d0e877fc610d1bdf8181ba70a90e4c14cc.tar.bz2 external_python_setuptools-451377d0e877fc610d1bdf8181ba70a90e4c14cc.zip | |
Detect and handle conflicts with "unmanaged" packages when installing
packages managed by EasyInstall. Also, add an option to exclude source
files from .egg distributions.
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041109
Diffstat (limited to 'setuptools/dist.py')
| -rw-r--r-- | setuptools/dist.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index 8fcd19ea..4fef454f 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -420,13 +420,16 @@ class Distribution(_Distribution): def install_eggs(self): from setuptools.command.easy_install import easy_install - cmd = easy_install(self, args="x") + cmd = easy_install(self, args="x", ignore_conflicts_at_my_risk=1) cmd.ensure_finalized() # finalize before bdist_egg munges install cmd + self.run_command('bdist_egg') args = [self.get_command_obj('bdist_egg').egg_output] + if setuptools.bootstrap_install_from: # Bootstrap self-installation of setuptools args.insert(0, setuptools.bootstrap_install_from) + cmd.args = args cmd.run() self.have_run['install'] = 1 @@ -446,9 +449,6 @@ class Distribution(_Distribution): - - - def get_cmdline_options(self): """Return a '{cmd: {opt:val}}' map of all command-line options |