[cig-commits] r5311 - cs/merlin/branches/v1/merlin/archimedes

[leif at geodynamics.org]

Author: leif
Date: 2006-11-16 20:03:13 -0800 (Thu, 16 Nov 2006)
New Revision: 5311

Modified:
   cs/merlin/branches/v1/merlin/archimedes/__init__.py
Log:
Work-around preinstalled pythia.merlin in archimedes.


Modified: cs/merlin/branches/v1/merlin/archimedes/__init__.py
===================================================================
--- cs/merlin/branches/v1/merlin/archimedes/__init__.py	2006-11-17 03:37:34 UTC (rev 5310)
+++ cs/merlin/branches/v1/merlin/archimedes/__init__.py	2006-11-17 04:03:13 UTC (rev 5311)
@@ -41,7 +41,8 @@
     """
     try:
         import merlin
-    except ImportError:
+        merlin.setup # AttributeError => merlin is pythia's merlin
+    except (ImportError, AttributeError):
         egg = download_merlin(package_index, to_dir, download_delay)
         sys.path.insert(0, egg)
         import merlin; merlin.bootstrap_install_from = egg