From 2c66805878d8f2b46241d8944e8b5af20eeeb9e1 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 27 Jan 2014 11:02:52 -0500 Subject: Backed out changeset: ef949e6e6de1, which was itself a backout of the fix for Distribute #323, so this backout restores that fix and also Fixes #141. --- setuptools/dist.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'setuptools/dist.py') diff --git a/setuptools/dist.py b/setuptools/dist.py index 3126cb96..0801ae74 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -260,9 +260,10 @@ class Distribution(_Distribution): """Resolve pre-setup requirements""" from pkg_resources import working_set, parse_requirements for dist in working_set.resolve( - parse_requirements(requires), installer=self.fetch_build_egg + parse_requirements(requires), installer=self.fetch_build_egg, + replace_conflicting=True ): - working_set.add(dist) + working_set.add(dist, replace=True) def finalize_options(self): _Distribution.finalize_options(self) -- cgit v1.2.1