X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=a9ac7692e7ae78f2c67faeb34e04a4fe64cd2939;hp=cd24f9a9d870c7e3a1844d96ef422f724aff9e61;hb=6a0d39ba688df2efbbf1d21d367200378f09f4a3;hpb=a66b375ceca1b5c2567659a5b2da806e9b9598ea

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index cd24f9a..a9ac769 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -1,5 +1,6 @@
 
 import os
+import sys
 import time
 
 from PyQt4.QtCore import *
@@ -19,6 +20,17 @@ 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.connect(self.process, SIGNAL("readyReadStandardOutput()"),
+                     self.processStandardOutput)
+        self.connect(self.process, SIGNAL("readyReadStandardError()"),
+                     self.processStandardError)
+
     def __init_command(self, args):
         self.args = QStringList()
         for arg in args:
@@ -28,12 +40,34 @@ class SfiProcess(QObject):
         if not self.exe:
             print "FATAL.. Could not locate binary sfi.py - not much we can do without that"
 
-        self.process = QProcess()
+    def isRunning(self):
+        return self.process.state() != QProcess.NotRunning
 
-        self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
-                     self.processFinished)
+    def processStandardOutput(self):
+        output = self.process.readAllStandardOutput()
+        if config.debug:
+            print output
+
+    def processStandardError(self):
+        print self.process.readAllStandardError()
 
     def processFinished(self):
+        if self.process.exitStatus() == QProcess.CrashExit:
+            print self.readOutput()
+            print "Process exited with errors:",
+            err = self.process.error()
+            if err == QProcess.FailedToStart:
+                print "FailedToStart"
+            elif err == QProcess.Crashed:
+                print "Crashed"
+            elif err == QProcess.Timedout:
+                print "Timedout"
+            elif err == QProcess.WriteError:
+                print "WriteError"
+            elif err == QProcess.ReadError:
+                print "ReadError"
+            elif err == QProcess.UnknownError:
+                print "UnknownError"
         self.trace_end()
         self.emit(SIGNAL("finished()"))
 
@@ -65,6 +99,16 @@ class SfiProcess(QObject):
         self.__init_command(args)
         self.start()
 
+    def applyRSpec(self, rspec):
+        filename = config.getSliceRSpecFile() + "_new"
+        rspec.save(filename)
+        args = ["-u", config.getUser(), "-a", config.getAuthority(), 
+                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create", 
+                config.getSlice(), filename]
+        self.__init_command(args)
+        self.start()
+        return filename
+
     def start(self):
         self.trace_command()
         self.process.start(self.exe, self.args)