[Python-checkins] r46143 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/command/easy_install.py

[phillip.eby]

Author: phillip.eby
Date: Tue May 23 21:12:03 2006
New Revision: 46143

Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
Log:
Don't install or update a ``site.py`` patch when installing to a
``PYTHONPATH`` directory with ``--multi-version``, unless an
``easy-install.pth`` file is already in use there.

(Bugfix merge from 0.7 trunk)


Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Tue May 23 21:12:03 2006
@@ -1111,6 +1111,10 @@
 
  * Ignore bdist_dumb distributions when looking at download URLs.
 
+ * Don't install or update a ``site.py`` patch when installing to a
+   ``PYTHONPATH`` directory with ``--multi-version``, unless an
+   ``easy-install.pth`` file is already in use there.
+
 0.6a11
  * Process ``dependency_links.txt`` if found in a distribution, by adding the
    URLs to the list for scanning.

Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	Tue May 23 21:12:03 2006
@@ -246,7 +246,6 @@
 
     def check_site_dir(self):
         """Verify that self.install_dir is .pth-capable dir, if needed"""
-
         instdir = normalize_path(self.install_dir)
         pth_file = os.path.join(instdir,'easy-install.pth')
 
@@ -281,10 +280,11 @@
         if instdir not in map(normalize_path, filter(None,PYTHONPATH)):
             # only PYTHONPATH dirs need a site.py, so pretend it's there
             self.sitepy_installed = True
-
+        elif self.multi_version and not os.path.exists(pth_file):
+            self.sitepy_installed = True    # don't need site.py in this case
+            self.pth_file = None            # and don't create a .pth file
         self.install_dir = instdir
 
-
     def cant_write_to_target(self):
         msg = """can't create or remove files in install directory
 
@@ -572,8 +572,6 @@
 
 
 
-
-
     def install_script(self, dist, script_name, script_text, dev_path=None):
         """Generate a legacy script wrapper and install it"""
         spec = str(dist.as_requirement())