X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=cd98a314f8f1a94634977129610dd6afc58a0713;hp=1e93b294c6186b86ad57404bb1079c82ae4126e9;hb=63c13e1e21fd4ec2309798ead773e22874c067cf;hpb=349fb978a1b7a88e741beef6aea4ac3d98a56efd

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 1e93b29..cd98a31 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -21,7 +21,10 @@ class SfiProcess(QObject):
     def __init__(self, parent=None):
         QObject.__init__(self, parent)
 
+        env = QProcess.systemEnvironment()
+        env << "PYTHONPATH=%s" % ":".join(sys.path)
         self.process = QProcess()
+        self.process.setEnvironment(env)
         self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
                      self.processFinished)
         
@@ -51,15 +54,9 @@ class SfiProcess(QObject):
         return self.process.state() != QProcess.NotRunning
 
     def processStandardOutput(self):
-        # NOTE: The signal readyReadStandardOutput is emitted when
-        # the process has made new data available through its standard output channel.
-        # But the process is not necessarily finished.
-        # It's cool to have this method wo we print the stdOut live,
-        # but we must be carefull with self.output, used by XmlrpcTracker too.
-        tmpOut = self.process.readAllStandardOutput()
+        output = self.process.readAllStandardOutput()
         if config.debug:
-            print tmpOut        
-        self.output += tmpOut
+            print output
 
     def processStandardError(self):
         print self.process.readAllStandardError()
@@ -103,8 +100,8 @@ class SfiProcess(QObject):
     def getRSpecFromSM(self):
         return self.__getRSpec(config.getSlicemgr())
 
-    def getRSpecFromAM(self):
-        return self.__getRSpec(config.getAggmgr())
+#    def getRSpecFromAM(self):
+#        return self.__getRSpec(config.getAggmgr())
 
     def getRecord(self, hrn):
         args = ["-u", config.getUser(), "-a", config.getAuthority(), 
@@ -134,11 +131,12 @@ class SfiProcess(QObject):
         if config.verbose:
             self._trace=time.time()
             command = "%s %s" % (self.exe, self.args.join(" "))
-            print time.strftime('%M:%S'),'Invoking',command
+            print time.strftime('%H:%M:%S'),'Invoking',command
 
     def trace_end (self):
         if config.verbose:
-            command = "%s %s" % (self.exe, self.args.join(" "))
-            print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'
+#            command = "%s %s" % (self.exe, self.args.join(" "))
+            print time.strftime('%H:%M:%S'),"Done [%.3f s]"%(time.time()-self._trace)
+        if config.debug:
             self.xmlrpctracker.getAndPrint(self.output)