[cig-commits] r15735 - cs/pythia/trunk

[leif at geodynamics.org]

Author: leif
Date: 2009-10-01 12:01:14 -0700 (Thu, 01 Oct 2009)
New Revision: 15735

Modified:
   cs/pythia/trunk/MANIFEST.in
   cs/pythia/trunk/setup.py
Log:
If merlin is already installed, run with it.


Modified: cs/pythia/trunk/MANIFEST.in
===================================================================
--- cs/pythia/trunk/MANIFEST.in	2009-10-01 04:05:03 UTC (rev 15734)
+++ cs/pythia/trunk/MANIFEST.in	2009-10-01 19:01:14 UTC (rev 15735)
@@ -19,7 +19,6 @@
 include journal/colors/__vault__.odb
 include journal/devices/color-console.odb
 include journal/devices/console.odb
-include journal/devices/db.odb
 include journal/devices/file.odb
 include journal/devices/remote.odb
 include journal/devices/__vault__.odb

Modified: cs/pythia/trunk/setup.py
===================================================================
--- cs/pythia/trunk/setup.py	2009-10-01 04:05:03 UTC (rev 15734)
+++ cs/pythia/trunk/setup.py	2009-10-01 19:01:14 UTC (rev 15735)
@@ -1,9 +1,13 @@
 
-from ez_setup import use_setuptools
-use_setuptools()
+try:
+    from merlin import setup, find_packages
 
-try:
+except (ImportError, AssertionError):
+    from ez_setup import use_setuptools
+    use_setuptools()
+
     from setuptools import setup, find_packages
+
 except AssertionError:
     from merlin import setup, find_packages