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 F39A11382C5 for ; Sat, 28 Apr 2018 20:19:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD9E1E081A; Sat, 28 Apr 2018 20:19:50 +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 B87EEE081A for ; Sat, 28 Apr 2018 20:19:50 +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 68D03335C9D for ; Sat, 28 Apr 2018 20:19:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 710A2287 for ; Sat, 28 Apr 2018 20:19:47 +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: <1524946686.efc4905546f505f69d5b1355aaa0c80e665a6f4a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/MetadataRegen.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: efc4905546f505f69d5b1355aaa0c80e665a6f4a X-VCS-Branch: master Date: Sat, 28 Apr 2018 20:19:47 +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: 891166fd-b069-4062-bf60-bd5b23bf950f X-Archives-Hash: 6f29964a91154841780a38cb5813f7d0 commit: efc4905546f505f69d5b1355aaa0c80e665a6f4a Author: Zac Medico gentoo org> AuthorDate: Sat Apr 28 20:18:06 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Apr 28 20:18:06 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=efc49055 MetadataRegen: fix deprecated _wait usage (bug 653856) Override PollScheduler._cleanup() instead of AsynchronousTask._wait(), since AsynchronousTask._wait() is deprecated. Bug: https://bugs.gentoo.org/653856 pym/_emerge/MetadataRegen.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py index d92b6a06e..8eb110a46 100644 --- a/pym/_emerge/MetadataRegen.py +++ b/pym/_emerge/MetadataRegen.py @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import portage @@ -77,18 +77,15 @@ class MetadataRegen(AsyncScheduler): settings=portdb.doebuild_settings, write_auxdb=self._write_auxdb) - def _wait(self): - - AsyncScheduler._wait(self) + def _cleanup(self): + super(MetadataRegen, self)._cleanup() portdb = self._portdb dead_nodes = {} - self._termination_check() - if self._terminated_tasks: + if self._terminated.is_set(): portdb.flush_cache() - self.returncode = self._cancelled_returncode - return self.returncode + return if self._global_cleanse: for mytree in portdb.porttrees: @@ -132,7 +129,6 @@ class MetadataRegen(AsyncScheduler): pass portdb.flush_cache() - return self.returncode def _task_exit(self, metadata_process):