[Python-checkins] r43296 - sandbox/trunk/setuptools/setuptools/command/install.py

[phillip.eby]

Author: phillip.eby
Date: Fri Mar 24 18:48:17 2006
New Revision: 43296

Modified:
   sandbox/trunk/setuptools/setuptools/command/install.py
Log:
Remove use of obsolete --ignore-conflicts-at-my-risk option


Modified: sandbox/trunk/setuptools/setuptools/command/install.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/install.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/install.py	Fri Mar 24 18:48:17 2006
@@ -85,8 +85,7 @@
         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 @@
 
 
 
+