[cig-commits] r5310 - in cs/merlin/branches/v1: merlin/archimedes merlin/command merlin.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2006-11-16 19:37:34 -0800 (Thu, 16 Nov 2006)
New Revision: 5310

Modified:
   cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt
   cs/merlin/branches/v1/merlin/archimedes/__init__.py
   cs/merlin/branches/v1/merlin/command/install_deps.py
Log:
Fixes for two Merlin bugs:

1) Fixed the command 'install_deps' so that it installs
Merlin itself in the bootstrap case.  The irony here is not
lost on me.  This was the first thing I complained about on
the distutils mailing list (regarding setuptools'
'develop' command).

2) In the 'archimedes' bootstrap script, don't delay when
stdout is redirected to a file.



Modified: cs/merlin/branches/v1/merlin/archimedes/__init__.py
===================================================================
--- cs/merlin/branches/v1/merlin/archimedes/__init__.py	2006-11-17 02:24:51 UTC (rev 5309)
+++ cs/merlin/branches/v1/merlin/archimedes/__init__.py	2006-11-17 03:37:34 UTC (rev 5310)
@@ -89,6 +89,8 @@
         src = dst = None
         try:
             from distutils import log
+            if not sys.stdout.isatty():
+                delay = 0
             if delay:
                 log.warn("""
 ---------------------------------------------------------------------------

Modified: cs/merlin/branches/v1/merlin/command/install_deps.py
===================================================================
--- cs/merlin/branches/v1/merlin/command/install_deps.py	2006-11-17 02:24:51 UTC (rev 5309)
+++ cs/merlin/branches/v1/merlin/command/install_deps.py	2006-11-17 03:37:34 UTC (rev 5310)
@@ -65,6 +65,10 @@
         # Ensure metadata is up-to-date
         self.run_command('egg_info')
         
+        if merlin.bootstrap_install_from:
+            self.easy_install(merlin.bootstrap_install_from)
+            merlin.bootstrap_install_from = None
+        
         # postprocess the installed distro, fixing up .pth, installing scripts,
         # and handling requirements
         self.process_distribution(None, self.dist, not self.no_deps)

Modified: cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt	2006-11-17 02:24:51 UTC (rev 5309)
+++ cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt	2006-11-17 03:37:34 UTC (rev 5310)
@@ -39,8 +39,8 @@
 merlin/command/build_py.py
 merlin/command/develop.py
 merlin/command/easy_install.py
+merlin/command/egg_flags.py
 merlin/command/egg_info.py
-merlin/command/flags.py
 merlin/command/install.py
 merlin/command/install_deps.py
 merlin/command/install_egg_info.py