[cig-commits] r6758 - cs/pythia/trunk/pyre/schedulers

[leif at geodynamics.org]

Author: leif
Date: 2007-05-02 13:40:50 -0700 (Wed, 02 May 2007)
New Revision: 6758

Modified:
   cs/pythia/trunk/pyre/schedulers/BatchScriptTemplate.py
   cs/pythia/trunk/pyre/schedulers/Job.py
Log:
Use 'str' instead of {input,output}File for the job's std{in,out,err},
so that garbage "stderr.txt" and "stdout.txt" files are not created.
(This became annoying when r6686 forced the initialization of file
properties, so that these files appeared everywhere, even w/o a batch
system.)


Modified: cs/pythia/trunk/pyre/schedulers/BatchScriptTemplate.py
===================================================================
--- cs/pythia/trunk/pyre/schedulers/BatchScriptTemplate.py	2007-05-02 20:25:05 UTC (rev 6757)
+++ cs/pythia/trunk/pyre/schedulers/BatchScriptTemplate.py	2007-05-02 20:40:50 UTC (rev 6758)
@@ -27,8 +27,8 @@
 
     def getRemoteFilename(self, name):
         # stub
-        stream = self.job.getTraitValue(name)
-        return stream.name
+        filename = self.job.getTraitValue(name)
+        return filename
 
 
     def getStagedFiles(self):

Modified: cs/pythia/trunk/pyre/schedulers/Job.py
===================================================================
--- cs/pythia/trunk/pyre/schedulers/Job.py	2007-05-02 20:25:05 UTC (rev 6757)
+++ cs/pythia/trunk/pyre/schedulers/Job.py	2007-05-02 20:40:50 UTC (rev 6758)
@@ -30,9 +30,9 @@
     mail              = pyre.bool("mail", default=False)
     dwalltime         = pyre.dimensional("walltime", default=0*minute)
     
-    stdin             = pyre.inputFile("stdin", default=util.devnull())
-    stdout            = pyre.outputFile("stdout", default="stdout.txt")
-    stderr            = pyre.outputFile("stderr", default="stderr.txt")
+    stdin             = pyre.str("stdin", default=util.devnull())
+    stdout            = pyre.str("stdout", default="stdout.txt")
+    stderr            = pyre.str("stderr", default="stderr.txt")
 
     environment       = pyre.list("environment")