From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 17 Mar 2011 20:08:35 +0000 (-0700)
Subject: AsynchronousLock: implement _cancel
X-Git-Tag: v2.2.0_alpha28~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0eab3143c1aad2addd0f88cfd7a62940d064df3a;p=portage.git

AsynchronousLock: implement _cancel
---

diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py
index 6e0a1ac2a..6fa2bf632 100644
--- a/pym/_emerge/AsynchronousLock.py
+++ b/pym/_emerge/AsynchronousLock.py
@@ -66,6 +66,10 @@ class AsynchronousLock(AsynchronousTask):
 		if not self._waiting:
 			self.wait()
 
+	def _cancel(self):
+		if self._imp is not None:
+			self._imp.cancel()
+
 	def _wait(self):
 		if self.returncode is not None:
 			return self.returncode
@@ -127,6 +131,10 @@ class _LockThread(AbstractPollTask):
 			self.returncode = os.EX_OK
 			self.wait()
 
+	def _cancel(self):
+		# There's currently no way to force thread termination.
+		pass
+
 	def _wait(self):
 		if self.returncode is not None:
 			return self.returncode