From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 57955138232 for ; Tue, 1 Jan 2013 22:40:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99C68E04EB; Tue, 1 Jan 2013 22:39:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26799E04EB for ; Tue, 1 Jan 2013 22:39:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32EB133D835 for ; Tue, 1 Jan 2013 22:39:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 83A51E5439 for ; Tue, 1 Jan 2013 22:39:50 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1357079865.60b16cdad4392093707873b98ea2adab1e0c642f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AsynchronousLock.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 60b16cdad4392093707873b98ea2adab1e0c642f X-VCS-Branch: master Date: Tue, 1 Jan 2013 22:39:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9574b067-2630-45c3-8bc8-db7c8854ecd9 X-Archives-Hash: 23aa66e94f26dc928226fd371bf84b81 commit: 60b16cdad4392093707873b98ea2adab1e0c642f Author: Zac Medico gentoo org> AuthorDate: Tue Jan 1 22:37:45 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jan 1 22:37:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=60b16cda 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. --- pym/_emerge/AsynchronousLock.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py index 5205414..2de1acd 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):