From 874bb1e0edb998be14cc504a3186be2636099d8e Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Fri, 24 Mar 2006 17:48:17 +0000 Subject: 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 --- setuptools/command/install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setuptools/command') 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 @@ -119,5 +118,6 @@ class install(_install): + -- cgit v1.2.3