[cig-commits] r5256 - in cs/pythia/trunk: . mpi/scripts pyre/inventory/odb pyre/scripts

[leif at geodynamics.org]

Author: leif
Date: 2006-11-13 14:47:48 -0800 (Mon, 13 Nov 2006)
New Revision: 5256

Removed:
   cs/pythia/trunk/pythia/
Modified:
   cs/pythia/trunk/mpi/scripts/mpistart.py
   cs/pythia/trunk/pyre/inventory/odb/Curator.py
   cs/pythia/trunk/pyre/scripts/jobstart.py
Log:
Fix-ups pertaining to the destruction of the pythia namespace.


Modified: cs/pythia/trunk/mpi/scripts/mpistart.py
===================================================================
--- cs/pythia/trunk/mpi/scripts/mpistart.py	2006-11-13 22:13:40 UTC (rev 5255)
+++ cs/pythia/trunk/mpi/scripts/mpistart.py	2006-11-13 22:47:48 UTC (rev 5256)
@@ -11,7 +11,7 @@
 #
 
 
-from pythia.mpi import mpistart
+from mpi import mpistart
 mpistart()
 
 

Modified: cs/pythia/trunk/pyre/inventory/odb/Curator.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/odb/Curator.py	2006-11-13 22:13:40 UTC (rev 5255)
+++ cs/pythia/trunk/pyre/inventory/odb/Curator.py	2006-11-13 22:47:48 UTC (rev 5256)
@@ -193,10 +193,8 @@
         # create the built-in depositories
         from pkg_resources import resource_listdir, resource_isdir, resource_exists, resource_filename, Requirement
         pythia = Requirement.parse("pythia")
-        namespace = "pythia"
-        entries = resource_listdir(pythia, namespace)
+        entries = resource_listdir(pythia, "")
         for entry in entries:
-            entry = namespace + '/' + entry
             if resource_isdir(pythia, entry):
                 vault = entry + '/__vault__.odb'
                 if resource_exists(pythia, vault):

Modified: cs/pythia/trunk/pyre/scripts/jobstart.py
===================================================================
--- cs/pythia/trunk/pyre/scripts/jobstart.py	2006-11-13 22:13:40 UTC (rev 5255)
+++ cs/pythia/trunk/pyre/scripts/jobstart.py	2006-11-13 22:47:48 UTC (rev 5256)
@@ -11,7 +11,7 @@
 #
 
 
-from pythia.pyre.schedulers import jobstart
+from pyre.schedulers import jobstart
 jobstart()