[cig-commits] r5211 - cs/merlin/trunk/merlin/command

[leif at geodynamics.org]

Author: leif
Date: 2006-11-08 16:49:08 -0800 (Wed, 08 Nov 2006)
New Revision: 5211

Modified:
   cs/merlin/trunk/merlin/command/easy_install.py
Log:
Tweaks so that 'site.py' and .pth files are installed.


Modified: cs/merlin/trunk/merlin/command/easy_install.py
===================================================================
--- cs/merlin/trunk/merlin/command/easy_install.py	2006-11-09 00:07:09 UTC (rev 5210)
+++ cs/merlin/trunk/merlin/command/easy_install.py	2006-11-09 00:49:08 UTC (rev 5211)
@@ -276,11 +276,13 @@
             if self.pth_file is None:
                 self.pth_file = PthDistributions(pth_file)
         else:
-            self.pth_file = None
+            if self.multi_version:
+                self.pth_file = None
+            else:
+                self.pth_file = PthDistributions(pth_file)
 
-        PYTHONPATH = os.environ.get('PYTHONPATH','').split(os.pathsep)
-        if instdir not in map(normalize_path, filter(None,PYTHONPATH)):
-            # only PYTHONPATH dirs need a site.py, so pretend it's there
+        if is_site_dir:
+            # real site dirs don't 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