diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-02-07 19:58:48 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-02-07 19:58:48 -0800 |
| commit | f17ff92635818620ea0df156dee4796c353d954a (patch) | |
| tree | e0fbec93a0d8fa07fe769d726d50be9ea9b872a8 /pym/_emerge/SubProcess.py | |
| parent | 082c908cd82426dfd45a2bf0ca9741213a7c7d5f (diff) | |
| download | portage-f17ff92635818620ea0df156dee4796c353d954a.tar.gz portage-f17ff92635818620ea0df156dee4796c353d954a.tar.bz2 portage-f17ff92635818620ea0df156dee4796c353d954a.zip | |
AbstractPollTask: add _wait_loop method
Diffstat (limited to 'pym/_emerge/SubProcess.py')
| -rw-r--r-- | pym/_emerge/SubProcess.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index c3dc74a91..17a3e8f20 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -64,8 +64,7 @@ class SubProcess(AbstractPollTask): if self._registered: if self.cancelled: - timeout = self._cancel_timeout - self.scheduler.schedule(self._reg_id, timeout=timeout) + self._wait_loop(timeout=self._cancel_timeout) if self._registered: try: os.kill(self.pid, signal.SIGKILL) @@ -73,12 +72,11 @@ class SubProcess(AbstractPollTask): if e.errno != errno.ESRCH: raise del e - self.scheduler.schedule(self._reg_id, timeout=timeout) + self._wait_loop(timeout=self._cancel_timeout) if self._registered: self._orphan_process_warn() else: - while self._registered: - self.scheduler.iteration() + self._wait_loop() self._unregister() if self.returncode is not None: return self.returncode |