X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=b6c5f046676ee2c952f5bcd1ac490ff43fb65dc4;hp=f794c63974ecb767f9d9bc49d09f02505dde24e0;hb=95ffcc9a39b6df94c6296cc42511c0140fd8a388;hpb=70e72bd79510c31811477e09f9b98bae94b10362 diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py index f794c63..b6c5f04 100644 --- a/sface/sfiprocess.py +++ b/sface/sfiprocess.py @@ -5,7 +5,7 @@ import time from PyQt4.QtCore import * from sface.config import config -from sface.xmlrpcwindow import XmlrpcTracker +from sface.xmlrpcwindow import XmlrpcTracker, XmlrpcReader def find_executable(exec_name): """find the given executable in $PATH""" @@ -28,7 +28,8 @@ class SfiProcess(QObject): self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"), self.processFinished) - self.xmlrpctracker = XmlrpcTracker() + self.xmlrpcreader = XmlrpcReader() # this one is for parsing XMLRPC responses + self.xmlrpctracker = XmlrpcTracker() # this one is for the debug window # holds aggregate output from processStandardOutput(); used by xmlrpc # tracker. @@ -44,9 +45,11 @@ class SfiProcess(QObject): self.args << "-d" self.args << config.get_dirname() - if config.debug: - # this shows xmlrpc conversation, see sfi.py docs. - self.args << QString('-D') + # this shows xmlrpc conversation, see sfi.py docs. + # always do this, so we can parse the XML result for faults and show + # then to the users. + self.args << QString('-D') + for arg in args: self.args << QString(arg) @@ -83,6 +86,14 @@ class SfiProcess(QObject): print "ReadError" elif err == QProcess.UnknownError: print "UnknownError" + + # extract any faults from the XMLRPC response(s) + self.xmlrpcreader.responses = [] + self.xmlrpcreader.store(self.output) + self.xmlrpcreader.extractXml() + self.responses = self.xmlrpcreader.responses + self.faults = [x for x in self.responses if (x["kind"]=="fault")] + self.trace_end() self.emit(SIGNAL("finished()")) @@ -174,6 +185,8 @@ class SfiProcess(QObject): self.start() def start(self): + self.respones = [] + self.faults = [] self.output = "" self.trace_command() self.process.start(self.exe, self.args)