From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QLRV0-00050v-Il for garchives@archives.gentoo.org; Sun, 15 May 2011 02:56:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00CCD1C002; Sun, 15 May 2011 02:55:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AC5ED1C002 for ; Sun, 15 May 2011 02:55:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D4A51B405C for ; Sun, 15 May 2011 02:55:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4B571B401E for ; Sun, 15 May 2011 02:55:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <03d2647d5c8d74088b29283598f8c4a0fef5db96.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 03d2647d5c8d74088b29283598f8c4a0fef5db96 Date: Sun, 15 May 2011 02:55:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 903ec9b2564592094d382a5a2d466788 commit: 03d2647d5c8d74088b29283598f8c4a0fef5db96 Author: Zac Medico gentoo org> AuthorDate: Sun May 15 02:55:24 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 15 02:55:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D03d2647d preserve-libs: use vardbapi _fs_lock/unlock The preserve-libs code is too dependent on the filesystem state to allow merging/unmerge/env_update to execute concurrently. --- pym/portage/dbapi/vartree.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index a2e38f6..5db267d 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1509,6 +1509,7 @@ class dblink(object): # remove preserved libraries that don't have any consumers left plib_registry =3D self.vartree.dbapi._plib_registry if plib_registry: + self.vartree.dbapi._fs_lock() plib_registry.lock() try: plib_registry.load() @@ -1564,6 +1565,7 @@ class dblink(object): plib_registry.store() finally: plib_registry.unlock() + self.vartree.dbapi._fs_unlock() =20 def unmerge(self, pkgfiles=3DNone, trimworld=3DNone, cleanup=3DTrue, ldpath_mtimes=3DNone, others_in_slot=3DNone, needed=3DNone, @@ -3409,6 +3411,7 @@ class dblink(object): preserve_paths =3D set() needed =3D None if not (linkmap is None or plib_registry is None): + self.vartree.dbapi._fs_lock() plib_registry.lock() try: plib_registry.load() @@ -3423,6 +3426,7 @@ class dblink(object): preserve_paths =3D self._find_libs_to_preserve() finally: plib_registry.unlock() + self.vartree.dbapi._fs_unlock() =20 if preserve_paths: self._add_preserve_libs_to_contents(preserve_paths) @@ -3507,6 +3511,7 @@ class dblink(object): =20 plib_registry =3D self.vartree.dbapi._plib_registry if plib_registry: + self.vartree.dbapi._fs_lock() plib_registry.lock() try: plib_registry.load() @@ -3563,6 +3568,7 @@ class dblink(object): plib_registry.store() finally: plib_registry.unlock() + self.vartree.dbapi._fs_unlock() =20 self.vartree.dbapi._add(self) contents =3D self.getcontents()