| 1 |
commit: c45bcf6145fe0a0a0bbc047a0739c3e9f6619d9a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 9 06:23:32 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 9 06:23:32 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c45bcf61 |
| 7 |
|
| 8 |
Use AbstractPollTask._wait_loop() more. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/AsynchronousLock.py | 6 ++---- |
| 12 |
pym/_emerge/FifoIpcDaemon.py | 6 +----- |
| 13 |
pym/_emerge/PipeReader.py | 5 +---- |
| 14 |
3 files changed, 4 insertions(+), 13 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py |
| 17 |
index 2c4fe10..3cf0acb 100644 |
| 18 |
--- a/pym/_emerge/AsynchronousLock.py |
| 19 |
+++ b/pym/_emerge/AsynchronousLock.py |
| 20 |
@@ -152,8 +152,7 @@ class _LockThread(AbstractPollTask): |
| 21 |
def _wait(self): |
| 22 |
if self.returncode is not None: |
| 23 |
return self.returncode |
| 24 |
- while self._registered: |
| 25 |
- self.scheduler.iteration() |
| 26 |
+ self._wait_loop() |
| 27 |
return self.returncode |
| 28 |
|
| 29 |
def unlock(self): |
| 30 |
@@ -264,8 +263,7 @@ class _LockProcess(AbstractPollTask): |
| 31 |
def _wait(self): |
| 32 |
if self.returncode is not None: |
| 33 |
return self.returncode |
| 34 |
- while self._registered: |
| 35 |
- self.scheduler.iteration() |
| 36 |
+ self._wait_loop() |
| 37 |
return self.returncode |
| 38 |
|
| 39 |
def _output_handler(self, f, event): |
| 40 |
|
| 41 |
diff --git a/pym/_emerge/FifoIpcDaemon.py b/pym/_emerge/FifoIpcDaemon.py |
| 42 |
index cbe8058..fcc4ab4 100644 |
| 43 |
--- a/pym/_emerge/FifoIpcDaemon.py |
| 44 |
+++ b/pym/_emerge/FifoIpcDaemon.py |
| 45 |
@@ -51,13 +51,9 @@ class FifoIpcDaemon(AbstractPollTask): |
| 46 |
def _wait(self): |
| 47 |
if self.returncode is not None: |
| 48 |
return self.returncode |
| 49 |
- |
| 50 |
- while self._registered: |
| 51 |
- self.scheduler.iteration() |
| 52 |
- |
| 53 |
+ self._wait_loop() |
| 54 |
if self.returncode is None: |
| 55 |
self.returncode = os.EX_OK |
| 56 |
- |
| 57 |
return self.returncode |
| 58 |
|
| 59 |
def _input_handler(self, fd, event): |
| 60 |
|
| 61 |
diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py |
| 62 |
index 54c6eb7..90febdf 100644 |
| 63 |
--- a/pym/_emerge/PipeReader.py |
| 64 |
+++ b/pym/_emerge/PipeReader.py |
| 65 |
@@ -43,10 +43,7 @@ class PipeReader(AbstractPollTask): |
| 66 |
def _wait(self): |
| 67 |
if self.returncode is not None: |
| 68 |
return self.returncode |
| 69 |
- |
| 70 |
- while self._registered: |
| 71 |
- self.scheduler.iteration() |
| 72 |
- |
| 73 |
+ self._wait_loop() |
| 74 |
self.returncode = os.EX_OK |
| 75 |
return self.returncode |
Archives