From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91A341382C5 for ; Sat, 28 Apr 2018 23:41:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B695BE0837; Sat, 28 Apr 2018 23:41:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 931CDE0837 for ; Sat, 28 Apr 2018 23:41:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75ED8335C92 for ; Sat, 28 Apr 2018 23:41:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDCA2297 for ; Sat, 28 Apr 2018 23:41:10 +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: <1524958607.01698b9f3f3145b3b902db9f4f5cb07f2f7c737f.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: 01698b9f3f3145b3b902db9f4f5cb07f2f7c737f X-VCS-Branch: master Date: Sat, 28 Apr 2018 23:41:10 +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: f2d5b39a-bc67-4994-be3f-b7d85e3e3a46 X-Archives-Hash: bb6c038b1590a4195dcbd049b379d547 commit: 01698b9f3f3145b3b902db9f4f5cb07f2f7c737f Author: Zac Medico gentoo org> AuthorDate: Sat Apr 28 23:36:47 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Apr 28 23:36:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=01698b9f AsynchronousLock: fix deprecated _wait usage (bug 653856) Use _async_wait() instead of wait(). Bug: https://bugs.gentoo.org/653856 pym/_emerge/AsynchronousLock.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py index 820d047b2..5cdfd98f6 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -83,6 +83,9 @@ class AsynchronousLock(AsynchronousTask): return self.returncode def _wait(self): + """ + Deprecated. Use _async_wait() instead. + """ if self.returncode is not None: return self.returncode self.returncode = self._imp.wait() @@ -142,7 +145,7 @@ class _LockThread(AbstractPollTask): def _run_lock_cb(self): self._unregister() self.returncode = os.EX_OK - self.wait() + self._async_wait() return False def _cancel(self): @@ -287,7 +290,7 @@ class _LockProcess(AbstractPollTask): self._acquired = True self._unregister() self.returncode = os.EX_OK - self.wait() + self._async_wait() return True