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 C7F59138331 for ; Sun, 22 Apr 2018 21:52:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB672E0896; Sun, 22 Apr 2018 21:52:16 +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 9A534E0896 for ; Sun, 22 Apr 2018 21:52:15 +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 70649335C78 for ; Sun, 22 Apr 2018 21:52:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF3A3295 for ; Sun, 22 Apr 2018 21:52:12 +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: <1524421853.c59348dc275b433d61735f8053e0db1a2ef6432b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PackageUninstall.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c59348dc275b433d61735f8053e0db1a2ef6432b X-VCS-Branch: master Date: Sun, 22 Apr 2018 21:52:12 +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: 0e785019-6069-48ba-9801-34a5933fe819 X-Archives-Hash: 43482be2020e03a4e933d9b7ece31259 commit: c59348dc275b433d61735f8053e0db1a2ef6432b Author: Zac Medico gentoo org> AuthorDate: Sat Apr 21 07:59:00 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Apr 22 18:30:53 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c59348dc PackageUninstall: use async_lock (bug 614112) Asynchronously lock the build directory, and use AsyncTaskFuture to fit the resulting future into the CompositeTask framework that PackageUninstall uses. Bug: https://bugs.gentoo.org/614112 pym/_emerge/PackageUninstall.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninstall.py index 8f19e38e4..3fe1fb0a6 100644 --- a/pym/_emerge/PackageUninstall.py +++ b/pym/_emerge/PackageUninstall.py @@ -55,8 +55,13 @@ class PackageUninstall(CompositeTask): self._builddir_lock = EbuildBuildDir( scheduler=self.scheduler, settings=self.settings) - self._builddir_lock.lock() + self._start_task( + AsyncTaskFuture(future=self._builddir_lock.async_lock()), + self._start_unmerge) + def _start_unmerge(self, lock_task): + self._assert_current(lock_task) + lock_task.future.result() portage.prepare_build_dirs( settings=self.settings, cleanup=True) @@ -74,6 +79,7 @@ class PackageUninstall(CompositeTask): noiselevel=-1) self._emergelog("=== Unmerging... (%s)" % (self.pkg.cpv,)) + cat, pf = portage.catsplit(self.pkg.cpv) unmerge_task = MergeProcess( mycat=cat, mypkg=pf, settings=self.settings, treetype="vartree", vartree=self.pkg.root_config.trees["vartree"],