equal
deleted
inserted
replaced
149 self.Proc.stderr, |
149 self.Proc.stderr, |
150 self.errors) |
150 self.errors) |
151 self.errt.start() |
151 self.errt.start() |
152 self.startsem.release() |
152 self.startsem.release() |
153 |
153 |
154 |
|
155 def output(self, v): |
154 def output(self, v): |
156 self.outdata.append(v) |
155 self.outdata.append(v) |
157 self.outlen += 1 |
156 self.outlen += 1 |
158 if not self.no_stdout: |
157 if not self.no_stdout: |
159 self.logger.write(v) |
158 self.logger.write(v) |
213 if self.endlock.acquire(False): |
212 if self.endlock.acquire(False): |
214 if not self.outt.finished and self.kill_it: |
213 if not self.outt.finished and self.kill_it: |
215 self.kill() |
214 self.kill() |
216 self.finishsem.release() |
215 self.finishsem.release() |
217 |
216 |
218 |
|
219 def spin(self): |
217 def spin(self): |
220 self.finishsem.acquire() |
218 self.finishsem.acquire() |
221 return [self.exitcode, "".join(self.outdata), "".join(self.errdata)] |
219 return [self.exitcode, "".join(self.outdata), "".join(self.errdata)] |