equal
deleted
inserted
replaced
55 self.retval = self.Proc.poll() |
55 self.retval = self.Proc.poll() |
56 else: |
56 else: |
57 self.retval = self.Proc.returncode |
57 self.retval = self.Proc.returncode |
58 |
58 |
59 outchunk = self.fd.readline() |
59 outchunk = self.fd.readline() |
60 if self.callback: self.callback(outchunk) |
60 if self.callback: |
|
61 self.callback(outchunk) |
61 while outchunk != '' and not self.killed: |
62 while outchunk != '' and not self.killed: |
62 outchunk = self.fd.readline() |
63 outchunk = self.fd.readline() |
63 if self.callback: self.callback(outchunk) |
64 if self.callback: |
|
65 self.callback(outchunk) |
64 if self.endcallback: |
66 if self.endcallback: |
65 try: |
67 try: |
66 err = self.Proc.wait() |
68 err = self.Proc.wait() |
67 except: |
69 except: |
68 err = self.retval |
70 err = self.retval |