fix merge between onelab and princeton repositories

[sface.git] / sface / sfiprocess.py

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 1d88155..8bb6627 100644 (file)
--- 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)
         
@@ -37,7 +40,6 @@ class SfiProcess(QObject):
 
     def __init_command(self, args):
         self.args = QStringList()
-        print "DEBUG FLAG:", config.debug
         if config.debug:
             # this shows xmlrpc conversation, see sfi.py docs.
             self.args << QString('-D')
@@ -52,16 +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()
-        print "STDOUT READY"
+        output = self.process.readAllStandardOutput()
         if config.debug:
-            print tmpOut        
-        self.output += tmpOut
+            print output
 
     def processStandardError(self):
         print self.process.readAllStandardError()