git://git.onelab.eu
/
sface.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7df4268
)
fix sfiprocess output so xmlrpctracker sees the whole output, instead of just part
author
smbaker
<smbaker@fc8clean.lan>
Wed, 29 Jun 2011 22:42:36 +0000
(15:42 -0700)
committer
smbaker
<smbaker@fc8clean.lan>
Wed, 29 Jun 2011 22:42:36 +0000
(15:42 -0700)
sface/sfiprocess.py
patch
|
blob
|
history
diff --git
a/sface/sfiprocess.py
b/sface/sfiprocess.py
index
bef0902
..
6f2140b
100644
(file)
--- a/
sface/sfiprocess.py
+++ b/
sface/sfiprocess.py
@@
-27,11
+27,12
@@
class SfiProcess(QObject):
self.process.setEnvironment(env)
self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
self.processFinished)
self.process.setEnvironment(env)
self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
self.processFinished)
-
+
self.xmlrpctracker = XmlrpcTracker()
self.xmlrpctracker = XmlrpcTracker()
- # in case self.output is read by the XmlrpcTracker before any
- # readyReadStandardOutput signal
- self.output = ''
+
+ # holds aggregate output from processStandardOutput(); used by xmlrpc
+ # tracker.
+ self.output = ""
self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
self.processStandardOutput)
self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
self.processStandardOutput)
@@
-55,6
+56,7
@@
class SfiProcess(QObject):
def processStandardOutput(self):
output = self.process.readAllStandardOutput()
def processStandardOutput(self):
output = self.process.readAllStandardOutput()
+ self.output = self.output + output
if config.debug:
print output
if config.debug:
print output
@@
-136,6
+138,7
@@
class SfiProcess(QObject):
self.start()
def start(self):
self.start()
def start(self):
+ self.output = ""
self.trace_command()
self.process.start(self.exe, self.args)
self.trace_command()
self.process.start(self.exe, self.args)