commit: efc4905546f505f69d5b1355aaa0c80e665a6f4a Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Apr 28 20:18:06 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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):
