| 1 |
commit: 082c908cd82426dfd45a2bf0ca9741213a7c7d5f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 8 03:26:21 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 8 03:34:16 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=082c908c |
| 7 |
|
| 8 |
Use PollScheduler iteration method. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/AsynchronousLock.py | 10 +++++----- |
| 12 |
pym/_emerge/CompositeTask.py | 5 +++-- |
| 13 |
pym/_emerge/FifoIpcDaemon.py | 7 +++---- |
| 14 |
pym/_emerge/PipeReader.py | 7 +++---- |
| 15 |
pym/_emerge/SubProcess.py | 5 +++-- |
| 16 |
5 files changed, 17 insertions(+), 17 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py |
| 19 |
index e166df3..2c4fe10 100644 |
| 20 |
--- a/pym/_emerge/AsynchronousLock.py |
| 21 |
+++ b/pym/_emerge/AsynchronousLock.py |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 2010-2011 Gentoo Foundation |
| 24 |
+# Copyright 2010-2012 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
import dummy_threading |
| 28 |
@@ -152,8 +152,8 @@ class _LockThread(AbstractPollTask): |
| 29 |
def _wait(self): |
| 30 |
if self.returncode is not None: |
| 31 |
return self.returncode |
| 32 |
- if self._registered: |
| 33 |
- self.scheduler.schedule(self._reg_id) |
| 34 |
+ while self._registered: |
| 35 |
+ self.scheduler.iteration() |
| 36 |
return self.returncode |
| 37 |
|
| 38 |
def unlock(self): |
| 39 |
@@ -264,8 +264,8 @@ class _LockProcess(AbstractPollTask): |
| 40 |
def _wait(self): |
| 41 |
if self.returncode is not None: |
| 42 |
return self.returncode |
| 43 |
- if self._registered: |
| 44 |
- self.scheduler.schedule(self._reg_id) |
| 45 |
+ while self._registered: |
| 46 |
+ self.scheduler.iteration() |
| 47 |
return self.returncode |
| 48 |
|
| 49 |
def _output_handler(self, f, event): |
| 50 |
|
| 51 |
diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py |
| 52 |
index 644a69b..e56188d 100644 |
| 53 |
--- a/pym/_emerge/CompositeTask.py |
| 54 |
+++ b/pym/_emerge/CompositeTask.py |
| 55 |
@@ -1,4 +1,4 @@ |
| 56 |
-# Copyright 1999-2011 Gentoo Foundation |
| 57 |
+# Copyright 1999-2012 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
from _emerge.AsynchronousTask import AsynchronousTask |
| 61 |
@@ -60,7 +60,8 @@ class CompositeTask(AsynchronousTask): |
| 62 |
self._current_task = None |
| 63 |
break |
| 64 |
else: |
| 65 |
- self.scheduler.schedule(condition=self._task_queued_wait) |
| 66 |
+ while not self._task_queued_wait(): |
| 67 |
+ self.scheduler.iteration() |
| 68 |
if self.returncode is not None: |
| 69 |
break |
| 70 |
elif self.cancelled: |
| 71 |
|
| 72 |
diff --git a/pym/_emerge/FifoIpcDaemon.py b/pym/_emerge/FifoIpcDaemon.py |
| 73 |
index b1f7a95..cbe8058 100644 |
| 74 |
--- a/pym/_emerge/FifoIpcDaemon.py |
| 75 |
+++ b/pym/_emerge/FifoIpcDaemon.py |
| 76 |
@@ -1,4 +1,4 @@ |
| 77 |
-# Copyright 2010-2011 Gentoo Foundation |
| 78 |
+# Copyright 2010-2012 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
from portage import os |
| 82 |
@@ -52,9 +52,8 @@ class FifoIpcDaemon(AbstractPollTask): |
| 83 |
if self.returncode is not None: |
| 84 |
return self.returncode |
| 85 |
|
| 86 |
- if self._registered: |
| 87 |
- self.scheduler.schedule(self._reg_id) |
| 88 |
- self._unregister() |
| 89 |
+ while self._registered: |
| 90 |
+ self.scheduler.iteration() |
| 91 |
|
| 92 |
if self.returncode is None: |
| 93 |
self.returncode = os.EX_OK |
| 94 |
|
| 95 |
diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py |
| 96 |
index a85d794..54c6eb7 100644 |
| 97 |
--- a/pym/_emerge/PipeReader.py |
| 98 |
+++ b/pym/_emerge/PipeReader.py |
| 99 |
@@ -1,4 +1,4 @@ |
| 100 |
-# Copyright 1999-2011 Gentoo Foundation |
| 101 |
+# Copyright 1999-2012 Gentoo Foundation |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
|
| 104 |
from portage import os |
| 105 |
@@ -44,9 +44,8 @@ class PipeReader(AbstractPollTask): |
| 106 |
if self.returncode is not None: |
| 107 |
return self.returncode |
| 108 |
|
| 109 |
- if self._registered: |
| 110 |
- self.scheduler.schedule(self._reg_ids) |
| 111 |
- self._unregister() |
| 112 |
+ while self._registered: |
| 113 |
+ self.scheduler.iteration() |
| 114 |
|
| 115 |
self.returncode = os.EX_OK |
| 116 |
return self.returncode |
| 117 |
|
| 118 |
diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py |
| 119 |
index c5cac7d..c3dc74a 100644 |
| 120 |
--- a/pym/_emerge/SubProcess.py |
| 121 |
+++ b/pym/_emerge/SubProcess.py |
| 122 |
@@ -1,4 +1,4 @@ |
| 123 |
-# Copyright 1999-2011 Gentoo Foundation |
| 124 |
+# Copyright 1999-2012 Gentoo Foundation |
| 125 |
# Distributed under the terms of the GNU General Public License v2 |
| 126 |
|
| 127 |
from portage import os |
| 128 |
@@ -77,7 +77,8 @@ class SubProcess(AbstractPollTask): |
| 129 |
if self._registered: |
| 130 |
self._orphan_process_warn() |
| 131 |
else: |
| 132 |
- self.scheduler.schedule(self._reg_id) |
| 133 |
+ while self._registered: |
| 134 |
+ self.scheduler.iteration() |
| 135 |
self._unregister() |
| 136 |
if self.returncode is not None: |
| 137 |
return self.returncode |
Archives