[cig-commits] r5210 - in cs/merlin/trunk: merlin/command merlin.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2006-11-08 16:07:09 -0800 (Wed, 08 Nov 2006)
New Revision: 5210

Modified:
   cs/merlin/trunk/merlin.egg-info/SOURCES.txt
   cs/merlin/trunk/merlin/command/easy_install.py
Log:
Patched 'easy_install' so that it creates the install dir
as needed, and doesn't complain about .pth/PYTHONPATH.  Ah...
That felt good.  The power of open source.


Modified: cs/merlin/trunk/merlin/command/easy_install.py
===================================================================
--- cs/merlin/trunk/merlin/command/easy_install.py	2006-11-08 23:45:19 UTC (rev 5209)
+++ cs/merlin/trunk/merlin/command/easy_install.py	2006-11-09 00:07:09 UTC (rev 5210)
@@ -259,14 +259,16 @@
             # make sure we can write to target dir
             testfile = self.pseudo_tempname()+'.write-test'
             test_exists = os.path.exists(testfile)
+            instdir_isdir = test_exists or os.path.isdir(instdir)
             try:
                 if test_exists: os.unlink(testfile)
+                elif not instdir_isdir: os.makedirs(instdir)
                 open(testfile,'w').close()
                 os.unlink(testfile)
             except (OSError,IOError):
                 self.cant_write_to_target()
 
-        if not is_site_dir and not self.multi_version:
+        if False and not is_site_dir and not self.multi_version:
             # Can't install non-multi to non-site dir
             raise DistutilsError(self.no_default_version_msg())
 
@@ -333,8 +335,10 @@
         pth_file = self.pseudo_tempname()+".pth"
         ok_file = pth_file+'.ok'
         ok_exists = os.path.exists(ok_file)
+        instdir_isdir = ok_exists or os.path.isdir(instdir)
         try:
             if ok_exists: os.unlink(ok_file)
+            elif not instdir_isdir: os.makedirs(instdir)
             f = open(pth_file,'w')
         except (OSError,IOError):
             self.cant_write_to_target()

Modified: cs/merlin/trunk/merlin.egg-info/SOURCES.txt
===================================================================
--- cs/merlin/trunk/merlin.egg-info/SOURCES.txt	2006-11-08 23:45:19 UTC (rev 5209)
+++ cs/merlin/trunk/merlin.egg-info/SOURCES.txt	2006-11-09 00:07:09 UTC (rev 5210)
@@ -24,15 +24,11 @@
 merlin/package_index.py
 merlin/sandbox.py
 merlin.egg-info/PKG-INFO
-merlin.egg-info/PKG-INFO~
 merlin.egg-info/SOURCES.txt
-merlin.egg-info/SOURCES.txt~
 merlin.egg-info/dependency_links.txt
 merlin.egg-info/entry_points.txt
-merlin.egg-info/entry_points.txt~
 merlin.egg-info/not-zip-safe
 merlin.egg-info/top_level.txt
-merlin.egg-info/top_level.txt~
 merlin/command/__init__.py
 merlin/command/alias.py
 merlin/command/bdist_egg.py