| 1 |
commit: 60b16cdad4392093707873b98ea2adab1e0c642f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 1 22:37:45 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 1 22:37:45 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=60b16cda |
| 7 |
|
| 8 |
Revert "AsynchronousLock: override _async_wait_cb" |
| 9 |
|
| 10 |
This reverts commit 83cfc04df383b56592b89f1dc58428c0e8d09925. |
| 11 |
This override could be bad if the base class needs to call _async_wait |
| 12 |
for some reason. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/_emerge/AsynchronousLock.py | 6 +++--- |
| 16 |
1 files changed, 3 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py |
| 19 |
index 5205414..2de1acd 100644 |
| 20 |
--- a/pym/_emerge/AsynchronousLock.py |
| 21 |
+++ b/pym/_emerge/AsynchronousLock.py |
| 22 |
@@ -119,12 +119,12 @@ class _LockThread(AbstractPollTask): |
| 23 |
def _run_lock(self): |
| 24 |
self._lock_obj = lockfile(self.path, wantnewlockfile=True) |
| 25 |
# Thread-safe callback to EventLoop |
| 26 |
- self._async_wait() |
| 27 |
+ self.scheduler.idle_add(self._run_lock_cb) |
| 28 |
|
| 29 |
- def _async_wait_cb(self): |
| 30 |
+ def _run_lock_cb(self): |
| 31 |
self._unregister() |
| 32 |
self.returncode = os.EX_OK |
| 33 |
- AbstractPollTask._async_wait_cb(self) |
| 34 |
+ self.wait() |
| 35 |
return False |
| 36 |
|
| 37 |
def _cancel(self): |
Archives