From: root <root@cassidy.cs.princeton.edu>
Date: Mon, 29 Nov 2010 17:41:56 +0000 (-0500)
Subject: fix merge between onelab and princeton repositories
X-Git-Tag: sface-0.1-4~4
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=1dbdb55c8d56e3c82047dc29a6789183f76d07a7;ds=sidebyside

fix merge between onelab and princeton repositories
---

1dbdb55c8d56e3c82047dc29a6789183f76d07a7
diff --cc sface/sfiprocess.py
index 1e93b29,a9ac769..8bb6627
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@@ -21,15 -20,12 +21,18 @@@ 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)
 +        
 +        self.xmlrpctracker = XmlrpcTracker()
 +        # in case self.output is read by the XmlrpcTracker before any
 +        # readyReadStandardOutput signal
 +        self.output = ''
 +
          self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
                       self.processStandardOutput)
          self.connect(self.process, SIGNAL("readyReadStandardError()"),