Commit 874bb1e0 authored by PJ Eby's avatar PJ Eby

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
parent d5eb0afd
......@@ -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
......@@ -119,5 +118,6 @@ class install(_install):
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment