[Checkins] SVN: zc.buildout/branches/reinout_distribute_upgrade_check/src/zc/buildout/easy_install.py Trying different way of getting at setuptools (or distribute) when easy_installing things.

[Reinout van Rees]

Log message for revision 105476:
  Trying different way of getting at setuptools (or distribute) when easy_installing things.
  This prevents a recursion when using distribute.
  (I am getting a different error when upgrading distribute, though).

Changed:
  U   zc.buildout/branches/reinout_distribute_upgrade_check/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/branches/reinout_distribute_upgrade_check/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/reinout_distribute_upgrade_check/src/zc/buildout/easy_install.py	2009-11-04 11:49:52 UTC (rev 105475)
+++ zc.buildout/branches/reinout_distribute_upgrade_check/src/zc/buildout/easy_install.py	2009-11-04 12:57:07 UTC (rev 105476)
@@ -296,8 +296,17 @@
 
         tmp = tempfile.mkdtemp(dir=dest)
         try:
+            # Detecting setuptools variant (which can also be distribute)
+            # including version number to prevent in-place upgrades that
+            # recurse.
+            found_setuptools = pkg_resources.working_set.find(
+                pkg_resources.Requirement.parse('setuptools'))
+            setuptools_requirement = '%s==%s' % (
+                found_setuptools.project_name,
+                found_setuptools.version)
             path = self._get_dist(
-                self._constrain(pkg_resources.Requirement.parse('setuptools')),
+                self._constrain(pkg_resources.Requirement.parse(
+                    setuptools_requirement)),
                 ws, False,
                 )[0].location