summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-01-01 14:37:45 -0800
committerZac Medico <zmedico@gentoo.org>2013-01-01 14:37:45 -0800
commit60b16cdad4392093707873b98ea2adab1e0c642f (patch)
treec4fae6087a4636a67b136aaa05717e3500b02799
parente1765ca490428c2fc4c1bf2d414c2174c402b85c (diff)
downloadportage-60b16cdad4392093707873b98ea2adab1e0c642f.tar.gz
portage-60b16cdad4392093707873b98ea2adab1e0c642f.tar.bz2
portage-60b16cdad4392093707873b98ea2adab1e0c642f.zip
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.
-rw-r--r--pym/_emerge/AsynchronousLock.py6
1 files changed, 3 insertions, 3 deletions
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):