From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 18 Mar 2011 23:45:47 +0000 (-0700)
Subject: TaskSequence: also call CompositeTask._cancel()
X-Git-Tag: v2.2.0_alpha29~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a8e23bdbca393d7e0edee50ef9a775fd8d11cdf;p=portage.git

TaskSequence: also call CompositeTask._cancel()

This is a regression from commit
363a7478a100495d2e8597bc6c6d2fdac94339e0 but it's usually not
noticeable with Ctrl-C since SIGINT is propagated to nested processes.
---

diff --git a/pym/_emerge/TaskSequence.py b/pym/_emerge/TaskSequence.py
index 5d6b73f15..1fecf6365 100644
--- a/pym/_emerge/TaskSequence.py
+++ b/pym/_emerge/TaskSequence.py
@@ -27,6 +27,7 @@ class TaskSequence(CompositeTask):
 
 	def _cancel(self):
 		self._task_queue.clear()
+		CompositeTask._cancel(self)
 
 	def _start_next_task(self):
 		self._start_task(self._task_queue.popleft(),