making ez_setup removing an existing setuptools distribution out of the way

--HG--
branch : distribute
extra : rebase_source : a97ad8f22e698747b81a097215b8ebffdf7edae6

2 files changed, 10 insertions, 2 deletions

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 54dd8158..f911ef8f 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -13,6 +13,15 @@ __all__ = [
     'find_packages'
 ]
 
+# This marker is used to simplify the process that checks is the
+# setuptools package was installed by the Setuptools project
+# or by the Distribute project, in case Setuptools creates
+# a distribution with the same version.
+#
+# The ez_setup script for instance, will check if this
+# attribute is present to decide wether to reinstall the package
+_distribute = True
+
 bootstrap_install_from = None
 
 def find_packages(where='.', exclude=()):
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2289b1d5..228a9a69 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -969,8 +969,7 @@ See the setuptools documentation for the "develop" command for more info.
         if not self.dry_run:
 
             self.pth_file.save()
-
-            if dist.key=='setuptools':
+            if dist.key=='distribute':
                 # Ensure that setuptools itself never becomes unavailable!
                 # XXX should this check for latest version?
                 filename = os.path.join(self.install_dir,'setuptools.pth')