From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 19 Oct 2012 01:27:59 +0000 (-0700)
Subject: PipeReader: unregister in _cancel
X-Git-Tag: v2.2.0_alpha142~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d2cb6ee98324b478a5671df2178f91104bcbd12;p=portage.git

PipeReader: unregister in _cancel
---

diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index fcdefb482..7209e9e93 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -34,8 +34,9 @@ class PipeReader(AbstractPollTask):
 		self._registered = True
 
 	def _cancel(self):
+		self._unregister()
 		if self.returncode is None:
-			self.returncode = 1
+			self.returncode = self._cancelled_returncode
 
 	def _wait(self):
 		if self.returncode is not None: