diff options
| author | PJ Eby <distutils-sig@python.org> | 2006-03-24 17:48:17 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2006-03-24 17:48:17 +0000 |
| commit | 874bb1e0edb998be14cc504a3186be2636099d8e (patch) | |
| tree | bdad586496af01d50179a8d4e6af1f74e1fbe4b9 /setuptools/command/install.py | |
| parent | d5eb0afd436989651a9f28de4a3521e456df3b15 (diff) | |
| download | external_python_setuptools-874bb1e0edb998be14cc504a3186be2636099d8e.tar.gz external_python_setuptools-874bb1e0edb998be14cc504a3186be2636099d8e.tar.bz2 external_python_setuptools-874bb1e0edb998be14cc504a3186be2636099d8e.zip | |
Remove use of obsolete --ignore-conflicts-at-my-risk option
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4043296
Diffstat (limited to 'setuptools/command/install.py')
| -rw-r--r-- | setuptools/command/install.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/command/install.py b/setuptools/command/install.py index d8da70c9..664614ac 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py @@ -85,8 +85,7 @@ class install(_install): from setuptools.command.easy_install import easy_install cmd = easy_install( - self.distribution, args="x", ignore_conflicts_at_my_risk=1, - root=self.root, record=self.record, + self.distribution, args="x", root=self.root, record=self.record, ) cmd.ensure_finalized() # finalize before bdist_egg munges install cmd @@ -121,3 +120,4 @@ class install(_install): + |