aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-03-16 22:36:33 -0700
committerZac Medico <zmedico@gentoo.org>2011-03-16 22:36:33 -0700
commit363a7478a100495d2e8597bc6c6d2fdac94339e0 (patch)
tree263a2e0a87442ca59634471de0ad0f3bb369ae8a /pym/_emerge/CompositeTask.py
parentUpdate Scheduler to protect against infinite loop (diff)
downloadportage-363a7478a100495d2e8597bc6c6d2fdac94339e0.tar.gz
portage-363a7478a100495d2e8597bc6c6d2fdac94339e0.tar.bz2
portage-363a7478a100495d2e8597bc6c6d2fdac94339e0.zip
AsynchronousTask: add _cancel template method
Diffstat (limited to 'pym/_emerge/CompositeTask.py')
-rw-r--r--pym/_emerge/CompositeTask.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py
index 8e8f0843c..edc0768d7 100644
--- a/pym/_emerge/CompositeTask.py
+++ b/pym/_emerge/CompositeTask.py
@@ -13,15 +13,13 @@ class CompositeTask(AsynchronousTask):
def isAlive(self):
return self._current_task is not None
- def cancel(self):
- self.cancelled = True
+ def _cancel(self):
if self._current_task is not None:
if self._current_task is self._TASK_QUEUED:
self.returncode = 1
self._current_task = None
else:
self._current_task.cancel()
- AsynchronousTask.cancel(self)
def _poll(self):
"""