[cig-commits] r5951 - cs/merlin/branches/v1/merlin

[leif at geodynamics.org]

Author: leif
Date: 2007-02-01 15:56:59 -0800 (Thu, 01 Feb 2007)
New Revision: 5951

Modified:
   cs/merlin/branches/v1/merlin/__init__.py
   cs/merlin/branches/v1/merlin/dist.py
Log:
Fix for exception when running the "merlin install" command.


Modified: cs/merlin/branches/v1/merlin/__init__.py
===================================================================
--- cs/merlin/branches/v1/merlin/__init__.py	2007-02-01 22:55:07 UTC (rev 5950)
+++ cs/merlin/branches/v1/merlin/__init__.py	2007-02-01 23:56:59 UTC (rev 5951)
@@ -97,6 +97,7 @@
         finally:
             distutils.core.gen_usage = old_gen_usage
 
+    from merlin.dist import Distribution
     class DistributionWithoutHelpCommands(Distribution):
         def _show_help(self,*args,**kw):
             with_ei_usage(lambda: Distribution._show_help(self,*args,**kw))

Modified: cs/merlin/branches/v1/merlin/dist.py
===================================================================
--- cs/merlin/branches/v1/merlin/dist.py	2007-02-01 22:55:07 UTC (rev 5950)
+++ cs/merlin/branches/v1/merlin/dist.py	2007-02-01 23:56:59 UTC (rev 5951)
@@ -633,7 +633,7 @@
             yield name
 
 
-    def parse_config_files (self, filenames=None):
+    def parse_config_files(self, filenames=None):
 
         import string
         from ConfigParser import ConfigParser