From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 1 Jan 2013 22:37:45 +0000 (-0800)
Subject: Revert "AsynchronousLock: override _async_wait_cb"
X-Git-Tag: v2.2.0_alpha150~64
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=60b16cdad4392093707873b98ea2adab1e0c642f;p=portage.git

Revert "AsynchronousLock: override _async_wait_cb"

This reverts commit 83cfc04df383b56592b89f1dc58428c0e8d09925.
This override could be bad if the base class needs to call _async_wait
for some reason.
---

diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py
index 520541432..2de1acdcf 100644
--- a/pym/_emerge/AsynchronousLock.py
+++ b/pym/_emerge/AsynchronousLock.py
@@ -119,12 +119,12 @@ class _LockThread(AbstractPollTask):
 	def _run_lock(self):
 		self._lock_obj = lockfile(self.path, wantnewlockfile=True)
 		# Thread-safe callback to EventLoop
-		self._async_wait()
+		self.scheduler.idle_add(self._run_lock_cb)
 
-	def _async_wait_cb(self):
+	def _run_lock_cb(self):
 		self._unregister()
 		self.returncode = os.EX_OK
-		AbstractPollTask._async_wait_cb(self)
+		self.wait()
 		return False
 
 	def _cancel(self):